import org.eclipse.jface.preference.IPreferenceStore;
import java.util.Hashtable;
+import java.util.ArrayList;
+import java.util.Enumeration;
import java.io.StringReader;
+import java.io.*;
import java.text.MessageFormat;
import net.sourceforge.phpeclipse.actions.PHPStartApacheAction;
import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPSegmentWithChildren;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPFunctionDeclaration;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPClassDeclaration;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPVarDeclaration;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPReqIncDeclaration;
+import net.sourceforge.phpdt.internal.compiler.parser.*;
/**
* A new php parser.
- * This php parser is inspired by the Java 1.2 grammar example
+ * This php parser is inspired by the Java 1.2 grammar example
* given with JavaCC. You can get JavaCC at http://www.webgain.com
* You can test the parser with the PHPParserTestCase2.java
* @author Matthieu Casanova
*/
-public class PHPParser extends PHPParserSuperclass {
+public final class PHPParser extends PHPParserSuperclass {
+ /** The file that is parsed. */
private static IFile fileToParse;
/** The current segment */
private static final String PARSE_ERROR_STRING = "Parse error"; //$NON-NLS-1$
private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
PHPOutlineInfo outlineInfo;
+
+ private static PHPFunctionDeclaration currentFunction;
+
+ /** 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 String errorMessage;
+ private static int errorStart = -1;
+ private static int errorEnd = -1;
+
public PHPParser() {
}
- public void setFileToParse(IFile fileToParse) {
+ public final void setFileToParse(final IFile fileToParse) {
this.fileToParse = fileToParse;
}
- public PHPParser(IFile fileToParse) {
+ public PHPParser(final IFile fileToParse) {
this(new StringReader(""));
this.fileToParse = fileToParse;
}
- public void phpParserTester(String strEval) throws CoreException, ParseException {
+ public static final void phpParserTester(final String strEval) throws CoreException, ParseException {
PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING);
- StringReader stream = new StringReader(strEval);
+ final StringReader stream = new StringReader(strEval);
if (jj_input_stream == null) {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
}
phpTest();
}
- public void htmlParserTester(String strEval) throws CoreException, ParseException {
- StringReader stream = new StringReader(strEval);
+ public static final void htmlParserTester(final File fileName) throws CoreException, ParseException {
+ try {
+ final Reader stream = new FileReader(fileName);
+ if (jj_input_stream == null) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ }
+ ReInit(stream);
+ phpFile();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace(); //To change body of catch statement use Options | File Templates.
+ }
+ }
+
+ public static final void htmlParserTester(final String strEval) throws CoreException, ParseException {
+ final StringReader stream = new StringReader(strEval);
if (jj_input_stream == null) {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
}
phpFile();
}
- public PHPOutlineInfo parseInfo(Object parent, String s) {
+ public final PHPOutlineInfo parseInfo(final Object parent, final String s) {
outlineInfo = new PHPOutlineInfo(parent);
currentSegment = outlineInfo.getDeclarations();
- StringReader stream = new StringReader(s);
+ final StringReader stream = new StringReader(s);
if (jj_input_stream == null) {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
}
if (errorMessage == null) {
PHPeclipsePlugin.log(e);
errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it";
+ errorStart = jj_input_stream.getPosition();
+ errorEnd = errorStart + 1;
}
setMarker(e);
errorMessage = null;
/**
* Create marker for the parse error
+ * @param e the ParseException
*/
- private static void setMarker(ParseException e) {
+ private static void setMarker(final ParseException e) {
try {
- setMarker(fileToParse, errorMessage, jj_input_stream.tokenBegin,jj_input_stream.tokenBegin+e.currentToken.image.length(), errorLevel);
+ if (errorStart == -1) {
+ setMarker(fileToParse,
+ errorMessage,
+ jj_input_stream.tokenBegin,
+ jj_input_stream.tokenBegin + e.currentToken.image.length(),
+ errorLevel,
+ "Line " + e.currentToken.beginLine);
+ } else {
+ setMarker(fileToParse,
+ errorMessage,
+ errorStart,
+ errorEnd,
+ errorLevel,
+ "Line " + e.currentToken.beginLine);
+ errorStart = -1;
+ errorEnd = -1;
+ }
} catch (CoreException e2) {
PHPeclipsePlugin.log(e2);
}
/**
* Create markers according to the external parser output
*/
- private static void createMarkers(String output, IFile file) throws CoreException {
+ private static void createMarkers(final String output, final IFile file) throws CoreException {
// delete all markers
file.deleteMarkers(IMarker.PROBLEM, false, 0);
int indx = 0;
- int brIndx = 0;
+ int brIndx;
boolean flag = true;
while ((brIndx = output.indexOf("<br />", indx)) != -1) {
// newer php error output (tested with 4.2.3)
}
}
- private static void scanLine(String output, IFile file, int indx, int brIndx) throws CoreException {
+ private static void scanLine(final String output,
+ final IFile file,
+ final int indx,
+ final int brIndx) throws CoreException {
String current;
StringBuffer lineNumberBuffer = new StringBuffer(10);
char ch;
}
}
- public void parse(String s) throws CoreException {
- ReInit(new StringReader(s));
+ public final void parse(final String s) throws CoreException {
+ final StringReader stream = new StringReader(s);
+ if (jj_input_stream == null) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ }
+ ReInit(stream);
try {
parse();
} catch (ParseException e) {
* Call the php parse command ( php -l -f <filename> )
* and create markers according to the external parser output
*/
- public static void phpExternalParse(IFile file) {
- IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
- String filename = file.getLocation().toString();
+ public static void phpExternalParse(final IFile file) {
+ final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
+ final String filename = file.getLocation().toString();
- String[] arguments = { filename };
- MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF));
- String command = form.format(arguments);
+ final String[] arguments = { filename };
+ final MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF));
+ final String command = form.format(arguments);
- String parserResult = PHPStartApacheAction.getParserOutput(command, "External parser: ");
+ final String parserResult = PHPStartApacheAction.getParserOutput(command, "External parser: ");
try {
// parse the buffer to find the errors and warnings
}
}
- public void parse() throws ParseException {
+ public static final void parse() throws ParseException {
phpFile();
}
}
<DEFAULT> TOKEN :
{
- <PHPSTART : "<?php" | "<?"> : PHPPARSING
+ <PHPSTARTSHORT : "<?"> : PHPPARSING
+| <PHPSTARTLONG : "<?php"> : PHPPARSING
+| <PHPECHOSTART : "<?="> : PHPPARSING
}
<PHPPARSING> TOKEN :
<PHPEND :"?>"> : DEFAULT
}
+/* Skip any character if we are not in php mode */
<DEFAULT> SKIP :
{
< ~[] >
/* WHITE SPACE */
-
<PHPPARSING> SKIP :
{
" "
}
/* COMMENTS */
-
-<PHPPARSING> MORE :
+<PHPPARSING> SPECIAL_TOKEN :
{
"//" : IN_SINGLE_LINE_COMMENT
|
+ "#" : IN_SINGLE_LINE_COMMENT
+|
<"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT
|
"/*" : IN_MULTI_LINE_COMMENT
}
-<IN_SINGLE_LINE_COMMENT>
-SPECIAL_TOKEN :
+<IN_SINGLE_LINE_COMMENT> SPECIAL_TOKEN :
+{
+ <SINGLE_LINE_COMMENT: "\n" | "\r" | "\r\n" > : PHPPARSING
+}
+
+<IN_SINGLE_LINE_COMMENT> SPECIAL_TOKEN :
{
- <SINGLE_LINE_COMMENT: "\n" | "\r" | "\r\n" | "?>" > : PHPPARSING
+ <SINGLE_LINE_COMMENT_PHPEND : "?>" > : DEFAULT
}
<IN_FORMAL_COMMENT>
| <ELSEIF : "elseif">
| <ELSE : "else">
| <ARRAY : "array">
+| <BREAK : "break">
+| <LIST : "list">
}
/* LANGUAGE CONSTRUCT */
<PHPPARSING> TOKEN :
{
- <PRINT : "print">
-| <ECHO : "echo">
-| <INCLUDE : "include">
-| <REQUIRE : "require">
-| <INCLUDE_ONCE : "include_once">
-| <REQUIRE_ONCE : "require_once">
-| <GLOBAL : "global">
-| <STATIC : "static">
-| <CLASSACCESS: "->">
-| <STATICCLASSACCESS: "::">
-| <ARRAYASSIGN: "=>">
+ <PRINT : "print">
+| <ECHO : "echo">
+| <INCLUDE : "include">
+| <REQUIRE : "require">
+| <INCLUDE_ONCE : "include_once">
+| <REQUIRE_ONCE : "require_once">
+| <GLOBAL : "global">
+| <STATIC : "static">
+| <CLASSACCESS : "->">
+| <STATICCLASSACCESS : "::">
+| <ARRAYASSIGN : "=>">
}
/* RESERVED WORDS AND LITERALS */
<PHPPARSING> TOKEN :
{
- < BREAK: "break" >
-| < CASE: "case" >
-| < CONST: "const" >
-| < CONTINUE: "continue" >
-| < _DEFAULT: "default" >
-| < DO: "do" >
-| < EXTENDS: "extends" >
-| < FALSE: "false" >
-| < FOR: "for" >
-| < GOTO: "goto" >
-| < NEW: "new" >
-| < NULL: "null" >
-| < RETURN: "return" >
-| < SUPER: "super" >
-| < SWITCH: "switch" >
-| < THIS: "this" >
-| < TRUE: "true" >
-| < WHILE: "while" >
-| < ENDWHILE : "endwhile" >
+ <CASE : "case">
+| <CONST : "const">
+| <CONTINUE : "continue">
+| <_DEFAULT : "default">
+| <DO : "do">
+| <EXTENDS : "extends">
+| <FOR : "for">
+| <GOTO : "goto">
+| <NEW : "new">
+| <NULL : "null">
+| <RETURN : "return">
+| <SUPER : "super">
+| <SWITCH : "switch">
+| <THIS : "this">
+| <TRUE : "true">
+| <FALSE : "false">
+| <WHILE : "while">
+| <ENDWHILE : "endwhile">
+| <ENDSWITCH: "endswitch">
+| <ENDIF : "endif">
+| <ENDFOR : "endfor">
+| <FOREACH : "foreach">
+| <AS : "as" >
}
/* TYPES */
-
<PHPPARSING> TOKEN :
{
- <STRING : "string">
-| <OBJECT : "object">
-| <BOOL : "bool">
+ <STRING : "string">
+| <OBJECT : "object">
+| <BOOL : "bool">
| <BOOLEAN : "boolean">
-| <REAL : "real">
-| <DOUBLE : "double">
-| <FLOAT : "float">
-| <INT : "int">
+| <REAL : "real">
+| <DOUBLE : "double">
+| <FLOAT : "float">
+| <INT : "int">
| <INTEGER : "integer">
}
<PHPPARSING> TOKEN :
{
- < _ORL : "OR" >
-| < _ANDL: "AND">
+ <_ORL : "OR">
+| <_ANDL : "AND">
}
/* LITERALS */
-
<PHPPARSING> TOKEN :
{
< INTEGER_LITERAL:
< STRING_LITERAL: (<STRING_1> | <STRING_2> | <STRING_3>)>
| < STRING_1:
"\""
- ( (~["\""])
- | "\\\""
+ (
+ ~["\""] | ~["{"]
+ |
+ "\\\""
+ | "{" ~["\""] "}"
)*
"\""
>
| < STRING_2:
"'"
- ( (~["'"]))*
+ (
+ ~["'"]
+ |
+ "\\'"
+ )*
"'"
>
| < STRING_3:
"`"
- ( (~["`"]))*
+ (
+ ~["`"]
+ |
+ "\\`"
+ )*
"`"
>
}
>
|
< #SPECIAL:
- "_"
+ "_" | ["\u007f"-"\u00ff"]
>
}
<PHPPARSING> TOKEN :
{
- < LPAREN: "(" >
-| < RPAREN: ")" >
-| < LBRACE: "{" >
-| < RBRACE: "}" >
-| < LBRACKET: "[" >
-| < RBRACKET: "]" >
-| < SEMICOLON: ";" >
-| < COMMA: "," >
-| < DOT: "." >
+ <LPAREN : "(">
+| <RPAREN : ")">
+| <LBRACE : "{">
+| <RBRACE : "}">
+| <LBRACKET : "[">
+| <RBRACKET : "]">
+| <SEMICOLON : ";">
+| <COMMA : ",">
+| <DOT : ".">
}
-/* OPERATORS */
+/* COMPARATOR */
<PHPPARSING> TOKEN :
{
- <AT : "@">
-| <DOLLAR : "$">
-| < ASSIGN: "=" >
-| < GT: ">" >
-| < LT: "<" >
-| < BANG: "!" >
-| < HOOK: "?" >
-| < COLON: ":" >
-| < EQ: "==" >
-| < LE: "<=" >
-| < GE: ">=" >
-| < NE: "!=" >
-| < SC_OR: "||" >
-| < SC_AND: "&&" >
-| < INCR: "++" >
-| < DECR: "--" >
-| < PLUS: "+" >
-| < MINUS: "-" >
-| < STAR: "*" >
-| < SLASH: "/" >
-| < BIT_AND: "&" >
-| < BIT_OR: "|" >
-| < XOR: "^" >
-| < REM: "%" >
-| < LSHIFT: "<<" >
-| < RSIGNEDSHIFT: ">>" >
-| < RUNSIGNEDSHIFT: ">>>" >
-| < PLUSASSIGN: "+=" >
-| < MINUSASSIGN: "-=" >
-| < STARASSIGN: "*=" >
-| < SLASHASSIGN: "/=" >
-| < ANDASSIGN: "&=" >
-| < ORASSIGN: "|=" >
-| < XORASSIGN: "^=" >
-| < DOTASSIGN: ".=" >
-| < REMASSIGN: "%=" >
-| < LSHIFTASSIGN: "<<=" >
-| < RSIGNEDSHIFTASSIGN: ">>=" >
-| < RUNSIGNEDSHIFTASSIGN: ">>>=" >
+ <GT : ">">
+| <LT : "<">
+| <EQ : "==">
+| <LE : "<=">
+| <GE : ">=">
+| <NE : "!=">
+| <DIF : "<>">
+| <BANGDOUBLEEQUAL : "!==">
+| <TRIPLEEQUAL : "===">
}
+/* ASSIGNATION */
<PHPPARSING> TOKEN :
{
- < DOLLAR_ID: <DOLLAR> <IDENTIFIER> >
+ <ASSIGN : "=">
+| <PLUSASSIGN : "+=">
+| <MINUSASSIGN : "-=">
+| <STARASSIGN : "*=">
+| <SLASHASSIGN : "/=">
+| <ANDASSIGN : "&=">
+| <ORASSIGN : "|=">
+| <XORASSIGN : "^=">
+| <DOTASSIGN : ".=">
+| <REMASSIGN : "%=">
+| <TILDEEQUAL : "~=">
}
-/*****************************************
- * THE JAVA LANGUAGE GRAMMAR STARTS HERE *
- *****************************************/
+/* OPERATORS */
+<PHPPARSING> TOKEN :
+{
+ <AT : "@">
+| <DOLLAR : "$">
+| <BANG : "!">
+| <TILDE : "~">
+| <HOOK : "?">
+| <COLON : ":">
+| <SC_OR : "||">
+| <SC_AND : "&&">
+| <INCR : "++">
+| <DECR : "--">
+| <PLUS : "+">
+| <MINUS : "-">
+| <STAR : "*">
+| <SLASH : "/">
+| <BIT_AND : "&">
+| <BIT_OR : "|">
+| <XOR : "^">
+| <REM : "%">
+| <LSHIFT : "<<">
+| <RSIGNEDSHIFT : ">>">
+| <RUNSIGNEDSHIFT : ">>>">
+| <LSHIFTASSIGN : "<<=">
+| <RSIGNEDSHIFTASSIGN : ">>=">
+}
-/*
- * Program structuring syntax follows.
- */
+<PHPPARSING> TOKEN :
+{
+ < DOLLAR_ID: <DOLLAR> <IDENTIFIER> >
+}
void phpTest() :
{}
void phpFile() :
{}
{
- (<PHPSTART> Php() <PHPEND>)*
- <EOF>
+ try {
+ (PhpBlock())*
+ <EOF>
+ } catch (TokenMgrError e) {
+ PHPeclipsePlugin.log(e);
+ errorStart = SimpleCharStream.getPosition();
+ errorEnd = errorStart + 1;
+ errorMessage = e.getMessage();
+ errorLevel = ERROR;
+ throw generateParseException();
+ }
+}
+
+/**
+ * A php block is a <?= expression [;]?>
+ * or <?php somephpcode ?>
+ * or <? somephpcode ?>
+ */
+void PhpBlock() :
+{
+ final int start = jj_input_stream.getPosition();
+}
+{
+ phpEchoBlock()
+|
+ [ <PHPSTARTLONG>
+ | <PHPSTARTSHORT>
+ {try {
+ setMarker(fileToParse,
+ "You should use '<?php' instead of '<?' it will avoid some problems with XML",
+ start,
+ jj_input_stream.getPosition(),
+ INFO,
+ "Line " + token.beginLine);
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }}
+ ]
+ Php()
+ try {
+ <PHPEND>
+ } catch (ParseException e) {
+ errorMessage = "'?>' expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+}
+
+void phpEchoBlock() :
+{}
+{
+ <PHPECHOSTART> Expression() [ <SEMICOLON> ] <PHPEND>
}
void Php() :
void ClassDeclaration() :
{
- PHPClassDeclaration classDeclaration;
- Token className;
- int pos = jj_input_stream.bufpos;
+ final PHPClassDeclaration classDeclaration;
+ final Token className;
+ final int pos;
}
{
- <CLASS> className = <IDENTIFIER> [ <EXTENDS> <IDENTIFIER> ]
+ <CLASS>
+ try {
+ {pos = jj_input_stream.getPosition();}
+ className = <IDENTIFIER>
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ [
+ <EXTENDS>
+ try {
+ <IDENTIFIER>
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ ]
{
- classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos);
- currentSegment.add(classDeclaration);
- currentSegment = classDeclaration;
+ if (currentSegment != null) {
+ classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos);
+ currentSegment.add(classDeclaration);
+ currentSegment = classDeclaration;
+ }
}
ClassBody()
{
- currentSegment = (PHPSegmentWithChildren) currentSegment.getParent();
+ if (currentSegment != null) {
+ currentSegment = (PHPSegmentWithChildren) currentSegment.getParent();
+ }
}
}
try {
<LBRACE>
} catch (ParseException e) {
- errorMessage = "'{' expected";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image + "', '{' expected";
errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
throw e;
}
( ClassBodyDeclaration() )*
try {
<RBRACE>
} catch (ParseException e) {
- errorMessage = "'var', 'function' or '}' expected";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', 'var', 'function' or '}' expected";
errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
throw e;
}
}
+/**
+ * A class can contain only methods and fields.
+ */
void ClassBodyDeclaration() :
{}
{
FieldDeclaration()
}
+/**
+ * A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;.
+ */
void FieldDeclaration() :
{
PHPVarDeclaration variableDeclaration;
}
{
<VAR> variableDeclaration = VariableDeclarator()
- {currentSegment.add(variableDeclaration);}
+ {
+ if (currentSegment != null) {
+ currentSegment.add(variableDeclaration);
+ }
+ }
( <COMMA>
- variableDeclaration = VariableDeclarator()
- {currentSegment.add(variableDeclaration);}
+ variableDeclaration = VariableDeclarator()
+ {
+ if (currentSegment != null) {
+ currentSegment.add(variableDeclaration);
+ }
+ }
)*
try {
<SEMICOLON>
} catch (ParseException e) {
- errorMessage = "';' expected after variable declaration";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration";
errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
throw e;
}
}
PHPVarDeclaration VariableDeclarator() :
{
- String varName;
- String varValue = null;
- int pos;
+ final String varName, varValue;
+ final int pos = jj_input_stream.getPosition();
}
{
varName = VariableDeclaratorId()
- {pos = jj_input_stream.tokenBegin;}
[
<ASSIGN>
try {
varValue = VariableInitializer()
+ {return new PHPVarDeclaration(currentSegment,varName.substring(1),pos,varValue);}
} catch (ParseException e) {
errorMessage = "Literal expression expected in variable initializer";
errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
throw e;
}
]
- {
- if (varValue == null) {
- return new PHPVarDeclaration(currentSegment,varName,pos);
- }
- return new PHPVarDeclaration(currentSegment,varName,pos,varValue);
- }
+ {return new PHPVarDeclaration(currentSegment,varName,pos);}
}
String VariableDeclaratorId() :
{
String expr;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
}
{
try {
} catch (ParseException e) {
errorMessage = "'$' expected for variable identifier";
errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
throw e;
}
}
String Variable():
{
String expr = null;
- Token token;
+ final Token token;
}
{
token = <DOLLAR_ID> [<LBRACE> expr = Expression() <RBRACE>]
{
if (expr == null) {
+ if (currentFunction != null) {
+ PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1));
+ if (var != null) {
+ var.getVariable().setUsed(true);
+ }
+ }
return token.image;
}
return token + "{" + expr + "}";
String VariableName():
{
String expr = null;
-Token token;
+final Token token;
}
{
<LBRACE> expr = Expression() <RBRACE>
token = <IDENTIFIER> [<LBRACE> expr = Expression() <RBRACE>]
{
if (expr == null) {
+ if (currentFunction != null) {
+ PHPVarDeclaration var = currentFunction.getParameter(token.image);
+ if (var != null) {
+ var.getVariable().setUsed(true);
+ }
+ }
return token.image;
}
return token + "{" + expr + "}";
}
|
<DOLLAR> expr = VariableName()
- {return "$" + expr;}
+ {
+ if (currentFunction != null) {
+ PHPVarDeclaration var = currentFunction.getParameter(expr);
+ if (var != null) {
+ var.getVariable().setUsed(true);
+ }
+ }
+ return "$" + expr;
+ }
|
+ token = <DOLLAR_ID>
+ {
+ if (currentFunction != null) {
+ PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1));
+ if (var != null) {
+ var.getVariable().setUsed(true);
+ }
+ }
+ return token.image + expr;
+ }
+/*| pas besoin ?
token = <DOLLAR_ID> [expr = VariableName()]
{
if (expr == null) {
return token.image;
}
return token.image + expr;
- }
+ }*/
}
String VariableInitializer() :
{
- String expr;
+ final String expr;
+ final Token token;
}
{
expr = Literal()
{return expr;}
+|
+ <MINUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
+ {return "-" + token.image;}
+|
+ <PLUS> (token = <INTEGER_LITERAL> | token = <FLOATING_POINT_LITERAL>)
+ {return "+" + token.image;}
+|
+ expr = ArrayDeclarator()
+ {return expr;}
+|
+ token = <IDENTIFIER>
+ {return token.image;}
}
String ArrayVariable() :
{
String expr;
-StringBuffer buff = new StringBuffer();
+final StringBuffer buff = new StringBuffer();
}
{
expr = Expression()
String ArrayInitializer() :
{
-String expr = null;
-StringBuffer buff = new StringBuffer("(");
+String expr;
+final StringBuffer buff = new StringBuffer("(");
}
{
<LPAREN> [ expr = ArrayVariable()
{buff.append(expr);}
( LOOKAHEAD(2) <COMMA> expr = ArrayVariable()
{buff.append(",").append(expr);}
- )* ]
+ )*
+ ]
+ [<COMMA> {buff.append(",");}]
<RPAREN>
{
buff.append(")");
}
}
+/**
+ * A Method Declaration.
+ * <b>function</b> MetodDeclarator() Block()
+ */
void MethodDeclaration() :
{
- PHPFunctionDeclaration functionDeclaration;
+ final PHPFunctionDeclaration functionDeclaration;
+ Token functionToken;
}
{
- <FUNCTION> functionDeclaration = MethodDeclarator()
+ functionToken = <FUNCTION>
+ try {
+ functionDeclaration = MethodDeclarator()
+ } catch (ParseException e) {
+ if (errorMessage != null) {
+ throw e;
+ }
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
{
- currentSegment.add(functionDeclaration);
- currentSegment = functionDeclaration;
+ if (currentSegment != null) {
+ currentSegment.add(functionDeclaration);
+ currentSegment = functionDeclaration;
+ }
+ currentFunction = functionDeclaration;
}
Block()
{
- currentSegment = (PHPSegmentWithChildren) currentSegment.getParent();
+ Hashtable parameters = currentFunction.getParameters();
+ Enumeration vars = parameters.elements();
+ while (vars.hasMoreElements()) {
+ PHPVarDeclaration o = (PHPVarDeclaration) vars.nextElement();
+ if (!o.getVariable().isUsed()) {
+ try {
+ setMarker(fileToParse,
+ "Parameter "+o.getVariable().getName()+" is never used in function",
+ functionToken.beginLine,
+ WARNING,
+ "Line " + token.beginLine);
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }
+ }
+ }
+ currentFunction = null;
+ if (currentSegment != null) {
+ currentSegment = (PHPSegmentWithChildren) currentSegment.getParent();
+ }
}
}
+/**
+ * A MethodDeclarator.
+ * [&] IDENTIFIER(parameters ...).
+ * @return a function description for the outline
+ */
PHPFunctionDeclaration MethodDeclarator() :
{
- Token identifier;
- StringBuffer methodDeclaration = new StringBuffer();
- String formalParameters;
- int pos = jj_input_stream.bufpos;
+ final Token identifier;
+ final StringBuffer methodDeclaration = new StringBuffer();
+ final Hashtable formalParameters;
+ final int pos = jj_input_stream.getPosition();
}
{
[ <BIT_AND> {methodDeclaration.append("&");} ]
identifier = <IDENTIFIER>
- {methodDeclaration.append(identifier);}
- formalParameters = FormalParameters()
+ formalParameters = FormalParameters()
{
- methodDeclaration.append(formalParameters);
- return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos);
+ methodDeclaration.append(identifier);
+ return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos,formalParameters);
}
}
-String FormalParameters() :
+/**
+ * FormalParameters follows method identifier.
+ * (FormalParameter())
+ */
+Hashtable FormalParameters() :
{
String expr;
final StringBuffer buff = new StringBuffer("(");
+ PHPVarDeclaration var;
+ final Hashtable parameters = new Hashtable();
}
{
try {
<LPAREN>
} catch (ParseException e) {
- errorMessage = "Formal parameter expected after function identifier";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier";
errorLevel = ERROR;
- jj_consume_token(token.kind);
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
}
- [ expr = FormalParameter()
- {buff.append(expr);}
- (
- <COMMA> expr = FormalParameter()
- {buff.append(",").append(expr);}
- )*
+ [ var = FormalParameter()
+ {parameters.put(var.getVariable().getName(),var);}
+ (
+ <COMMA> var = FormalParameter()
+ {parameters.put(var.getVariable().getName(),var);}
+ )*
]
try {
<RPAREN>
} catch (ParseException e) {
errorMessage = "')' expected";
errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
throw e;
}
- {
- buff.append(")");
- return buff.toString();
- }
+ {return parameters;}
}
-String FormalParameter() :
+/**
+ * A formal parameter.
+ * $varname[=value] (,$varname[=value])
+ */
+PHPVarDeclaration FormalParameter() :
{
- PHPVarDeclaration variableDeclaration;
- StringBuffer buff = new StringBuffer();
+ final PHPVarDeclaration variableDeclaration;
+ Token token = null;
}
{
- [<BIT_AND> {buff.append("&");}] variableDeclaration = VariableDeclarator()
+ [token = <BIT_AND>] variableDeclaration = VariableDeclarator()
{
- buff.append(variableDeclaration.toString());
- return buff.toString();
+ if (token != null) {
+ variableDeclaration.getVariable().setPrefix("@");
+ }
+ return variableDeclaration;
}
}
|
<INTEGER>
{return "integer";}
+|
+ <OBJECT>
+ {return "object";}
}
String Expression() :
{
- String expr;
- String assignOperator = null;
- String expr2 = null;
+ final String expr;
+ final String assignOperator;
+ final String expr2;
}
{
expr = PrintExpression()
{return expr;}
|
+ expr = ListExpression()
+ {return expr;}
+|
expr = ConditionalExpression()
[
assignOperator = AssignmentOperator()
- expr2 = Expression()
- ]
- {
- if (expr2 == null) {
- return expr;
- } else {
- return expr + assignOperator + expr2;
+ try {
+ expr2 = Expression()
+ {return expr + assignOperator + expr2;}
+ } catch (ParseException e) {
+ if (errorMessage != null) {
+ throw e;
+ }
+ errorMessage = "expression expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
}
- }
+ ]
+ {return expr;}
}
String AssignmentOperator() :
-{
- Token assignOperator;
-}
+{}
{
<ASSIGN>
{return "=";}
{return "<<=";}
| <RSIGNEDSHIFTASSIGN>
{return ">>=";}
-| <RUNSIGNEDSHIFTASSIGN>
-{return ">>>=";}
| <ANDASSIGN>
{return "&=";}
| <XORASSIGN>
{return "|=";}
| <DOTASSIGN>
{return ".=";}
+| <TILDEEQUAL>
+{return "~=";}
}
String ConditionalExpression() :
{
- String expr;
+ final String expr;
String expr2 = null;
String expr3 = null;
}
{
String expr;
Token operator;
- String expr2 = null;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
}
{
expr = ConditionalAndExpression()
- {
- buff.append(expr);
- }
+ {buff.append(expr);}
(
- (operator = <SC_OR> | operator = <_ORL>) expr2 = ConditionalAndExpression()
+ (operator = <SC_OR> | operator = <_ORL>) expr = ConditionalAndExpression()
{
buff.append(operator.image);
- buff.append(expr2);
+ buff.append(expr);
}
)*
{
{
String expr;
Token operator;
- String expr2 = null;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
}
{
expr = ConcatExpression()
- {
- buff.append(expr);
- }
+ {buff.append(expr);}
(
- (operator = <SC_AND> | operator = <_ANDL>) expr2 = ConcatExpression()
+ (operator = <SC_AND> | operator = <_ANDL>) expr = ConcatExpression()
{
buff.append(operator.image);
- buff.append(expr2);
+ buff.append(expr);
}
)*
- {
- return buff.toString();
- }
+ {return buff.toString();}
}
String ConcatExpression() :
{
String expr;
- String expr2 = null;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
}
{
expr = InclusiveOrExpression()
- {
- buff.append(expr);
- }
+ {buff.append(expr);}
(
- <DOT> expr2 = InclusiveOrExpression()
- {
- buff.append(".");
- buff.append(expr2);
- }
+ <DOT> expr = InclusiveOrExpression()
+ {buff.append(".").append(expr);}
)*
- {
- return buff.toString();
- }
+ {return buff.toString();}
}
String InclusiveOrExpression() :
{
String expr;
- String expr2 = null;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
}
{
expr = ExclusiveOrExpression()
- {
- buff.append(expr);
- }
+ {buff.append(expr);}
(
- <BIT_OR> expr2 = ExclusiveOrExpression()
- {
- buff.append("|");
- buff.append(expr2);
- }
+ <BIT_OR> expr = ExclusiveOrExpression()
+ {buff.append("|").append(expr);}
)*
- {
- return buff.toString();
- }
+ {return buff.toString();}
}
String ExclusiveOrExpression() :
{
String expr;
- String expr2 = null;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
}
{
expr = AndExpression()
buff.append(expr);
}
(
- <XOR> expr2 = AndExpression()
+ <XOR> expr = AndExpression()
{
buff.append("^");
- buff.append(expr2);
+ buff.append(expr);
}
)*
{
String AndExpression() :
{
String expr;
- String expr2 = null;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
}
{
expr = EqualityExpression()
buff.append(expr);
}
(
- <BIT_AND> expr2 = EqualityExpression()
+ <BIT_AND> expr = EqualityExpression()
{
- buff.append("&");
- buff.append(expr2);
+ buff.append("&").append(expr);
}
)*
- {
- return buff.toString();
- }
+ {return buff.toString();}
}
String EqualityExpression() :
{
String expr;
Token operator;
- String expr2;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
}
{
expr = RelationalExpression()
{buff.append(expr);}
(
- ( operator = <EQ> | operator = <NE> ) expr2 = RelationalExpression()
+ ( operator = <EQ>
+ | operator = <DIF>
+ | operator = <NE>
+ | operator = <BANGDOUBLEEQUAL>
+ | operator = <TRIPLEEQUAL>
+ )
+ try {
+ expr = RelationalExpression()
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected after '"+operator.image+"'";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
{
buff.append(operator.image);
- buff.append(expr2);
+ buff.append(expr);
}
)*
{return buff.toString();}
{
String expr;
Token operator;
- String expr2;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
}
{
expr = ShiftExpression()
{buff.append(expr);}
(
- ( operator = <LT> | operator = <GT> | operator = <LE> | operator = <GE> ) expr2 = ShiftExpression()
- {
- buff.append(operator.image);
- buff.append(expr2);
- }
+ ( operator = <LT> | operator = <GT> | operator = <LE> | operator = <GE> ) expr = ShiftExpression()
+ {buff.append(operator.image).append(expr);}
)*
{return buff.toString();}
}
{
String expr;
Token operator;
- String expr2;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
}
{
expr = AdditiveExpression()
{buff.append(expr);}
(
- (operator = <LSHIFT> | operator = <RSIGNEDSHIFT> | operator = <RUNSIGNEDSHIFT> ) expr2 = AdditiveExpression()
+ (operator = <LSHIFT> | operator = <RSIGNEDSHIFT> | operator = <RUNSIGNEDSHIFT> ) expr = AdditiveExpression()
{
buff.append(operator.image);
- buff.append(expr2);
+ buff.append(expr);
}
)*
{return buff.toString();}
{
String expr;
Token operator;
- String expr2;
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
}
{
expr = MultiplicativeExpression()
{buff.append(expr);}
(
- ( operator = <PLUS> | operator = <MINUS> ) expr2 = MultiplicativeExpression()
+ ( operator = <PLUS> | operator = <MINUS> ) expr = MultiplicativeExpression()
{
buff.append(operator.image);
- buff.append(expr2);
+ buff.append(expr);
}
)*
{return buff.toString();}
String MultiplicativeExpression() :
{
- String expr, expr2;
+ String expr;
Token operator;
final StringBuffer buff = new StringBuffer();}
{
- expr = UnaryExpression()
+ try {
+ expr = UnaryExpression()
+ } catch (ParseException e) {
+ errorMessage = "unexpected token '"+e.currentToken.next.image+"'";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
{buff.append(expr);}
(
- ( operator = <STAR> | operator = <SLASH> | operator = <REM> ) expr2 = UnaryExpression()
- {
- buff.append(operator.image);
- buff.append(expr2);
- }
+ ( operator = <STAR> | operator = <SLASH> | operator = <REM> ) expr = UnaryExpression()
+ {
+ buff.append(operator.image);
+ buff.append(expr);
+ }
)*
{return buff.toString();}
}
+/**
+ * An unary expression starting with @, & or nothing
+ */
String UnaryExpression() :
{
- String expr;
+ final String expr;
+ final Token token;
final StringBuffer buff = new StringBuffer();
}
{
- <AT> expr = UnaryExpression()
- {return "@" + expr;}
-|
- ( <PLUS> {buff.append("+");}| <MINUS> {buff.append("-");}) expr = UnaryExpression()
+ token = <BIT_AND> expr = UnaryExpressionNoPrefix()
{
- buff.append(expr);
- return buff.toString();
+ if (token == null) {
+ return expr;
+ }
+ return token.image + expr;
}
|
- expr = PreIncrementExpression()
- {return expr;}
+ (<AT> {buff.append("@");})* expr = UnaryExpressionNoPrefix()
+ {return buff.append(expr).toString();}
+}
+
+String UnaryExpressionNoPrefix() :
+{
+ final String expr;
+ final Token token;
+}
+{
+ ( token = <PLUS> | token = <MINUS> ) expr = UnaryExpression()
+ {
+ return token.image + expr;
+ }
|
- expr = PreDecrementExpression()
+ expr = PreIncDecExpression()
{return expr;}
|
expr = UnaryExpressionNotPlusMinus()
{return expr;}
}
-String PreIncrementExpression() :
-{
-String expr;
-}
-{
- <INCR> expr = PrimaryExpression()
- {return "++"+expr;}
-}
-String PreDecrementExpression() :
+String PreIncDecExpression() :
{
-String expr;
+final String expr;
+final Token token;
}
{
- <DECR> expr = PrimaryExpression()
- {return "--"+expr;}
+ (token = <INCR> | token = <DECR>) expr = PrimaryExpression()
+ {return token.image + expr;}
}
String UnaryExpressionNotPlusMinus() :
{
- String expr;
+ final String expr;
}
{
<BANG> expr = UnaryExpression()
{return "!" + expr;}
|
- LOOKAHEAD( <LPAREN> Type() <RPAREN> )
+ LOOKAHEAD( <LPAREN> (Type() | <ARRAY>) <RPAREN> )
expr = CastExpression()
{return expr;}
|
expr = Literal()
{return expr;}
|
- <LPAREN> expr = Expression()<RPAREN>
+ <LPAREN> expr = Expression()
+ try {
+ <RPAREN>
+ } catch (ParseException e) {
+ errorMessage = "')' expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
{return "("+expr+")";}
}
String CastExpression() :
{
-String type;
-String expr;
+final String type, expr;
}
{
- <LPAREN> type = Type() <RPAREN> expr = UnaryExpression()
+ <LPAREN> (type = Type() | <ARRAY> {type = "array";}) <RPAREN> expr = UnaryExpression()
{return "(" + type + ")" + expr;}
}
String PostfixExpression() :
{
- String expr;
+ final String expr;
Token operator = null;
}
{
String PrimaryExpression() :
{
- Token identifier;
+ final Token identifier;
String expr;
final StringBuffer buff = new StringBuffer();
}
( expr = PrimarySuffix() {buff.append(expr);} )*
{return buff.toString();}
|
+ expr = ArrayDeclarator()
+ {return "array" + expr;}
+}
+
+String ArrayDeclarator() :
+{
+ final String expr;
+}
+{
<ARRAY> expr = ArrayInitializer()
{return "array" + expr;}
}
String PrimaryPrefix() :
{
- String expr;
- Token token = null;
+ final String expr;
+ final Token token;
}
{
token = <IDENTIFIER>
{return token.image;}
|
- [token = <BIT_AND>] <NEW> expr = ClassIdentifier()
+ <NEW> expr = ClassIdentifier()
{
- if (token == null) {
- return "new " + expr;
- }
- return "new &" + expr;
+ return "new " + expr;
}
-|
+|
expr = VariableDeclaratorId()
{return expr;}
}
-String ClassIdentifier():
+String classInstantiation() :
{
String expr;
- Token token;
+ final StringBuffer buff = new StringBuffer("new ");
+}
+{
+ <NEW> expr = ClassIdentifier()
+ {buff.append(expr);}
+ [
+ expr = PrimaryExpression()
+ {buff.append(expr);}
+ ]
+ {return buff.toString();}
+}
+
+String ClassIdentifier():
+{
+ final String expr;
+ final Token token;
}
{
token = <IDENTIFIER>
String PrimarySuffix() :
{
- String expr;
+ final String expr;
}
{
expr = Arguments()
String expr = null;
}
{
- <CLASSACCESS> expr = VariableName()
+ <CLASSACCESS>
+ try {
+ expr = VariableName()
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
{return "->" + expr;}
-|
- <LBRACKET> [ expr = Expression() ] <RBRACKET>
+|
+ <LBRACKET> [ expr = Expression() | expr = Type() ] //Not good
+ try {
+ <RBRACKET>
+ } catch (ParseException e) {
+ errorMessage = "']' expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
{
if(expr == null) {
return "[]";
String Literal() :
{
- String expr;
- Token token;
+ final String expr;
+ final Token token;
}
{
token = <INTEGER_LITERAL>
token = <FLOATING_POINT_LITERAL>
{return token.image;}
|
- try {
- token = <STRING_LITERAL>
+ token = <STRING_LITERAL>
{return token.image;}
- } catch (TokenMgrError e) {
- errorMessage = "unterminated string";
- errorLevel = ERROR;
- throw generateParseException();
- }
|
expr = BooleanLiteral()
{return expr;}
|
- expr = NullLiteral()
- {return expr;}
+ <NULL>
+ {return "null";}
}
String BooleanLiteral() :
{return "false";}
}
-String NullLiteral() :
-{}
-{
- <NULL>
- {return "null";}
-}
-
String Arguments() :
{
String expr = null;
try {
<RPAREN>
} catch (ParseException e) {
- errorMessage = "')' expected to close the argument list";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list";
errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
throw e;
}
{
String ArgumentList() :
{
String expr;
-StringBuffer buff = new StringBuffer();
+final StringBuffer buff = new StringBuffer();
}
{
expr = Expression()
} catch (ParseException e) {
errorMessage = "expression expected after a comma in argument list";
errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
throw e;
}
{
- buff.append(",").append("expr");
+ buff.append(",").append(expr);
}
)*
{return buff.toString();}
}
-/*
- * Statement syntax follows.
+/**
+ * A Statement without break
*/
-
-void Statement() :
+void StatementNoBreak() :
{}
{
LOOKAHEAD(2)
- Expression() (<SEMICOLON> | "?>")
+ Expression()
+ try {
+ <SEMICOLON>
+ } catch (ParseException e) {
+ if (e.currentToken.next.kind != 4) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ }
|
LOOKAHEAD(2)
LabeledStatement()
try {
<SEMICOLON>
} catch (ParseException e) {
- errorMessage = "';' expected after expression";
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
throw e;
}
|
|
ForStatement()
|
- BreakStatement()
+ ForeachStatement()
|
ContinueStatement()
|
GlobalStatement()
}
+/**
+ * A Normal statement
+ */
+void Statement() :
+{}
+{
+ StatementNoBreak()
+|
+ BreakStatement()
+}
+
+void htmlBlock() :
+{}
+{
+ <PHPEND> (phpEchoBlock())* (<PHPSTARTLONG> | <PHPSTARTSHORT>)
+}
+
+/**
+ * An include statement. It's "include" an expression;
+ */
void IncludeStatement() :
{
- Token token;
- String expr;
- int pos;
+ final String expr;
+ final Token token;
+ final int pos = jj_input_stream.getPosition();
}
{
- token = <REQUIRE>
- {pos = token.beginLine;}
+ ( token = <REQUIRE>
+ | token = <REQUIRE_ONCE>
+ | token = <INCLUDE>
+ | token = <INCLUDE_ONCE> )
expr = Expression()
- {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require",pos,expr));}
- (<SEMICOLON> | "?>")
-|
- token = <REQUIRE_ONCE>
- {pos = token.beginLine;}
- expr = Expression()
- {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "require_once",pos,expr));}
- (<SEMICOLON> | "?>")
-|
- token = <INCLUDE>
- {pos = token.beginLine;}
- expr = Expression()
- {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include",pos,expr));}
- (<SEMICOLON> | "?>")
-|
- token = <INCLUDE_ONCE>
- {pos = token.beginLine;}
- expr = Expression()
- {currentSegment.add(new PHPReqIncDeclaration(currentSegment, "include_once",pos,expr));}
- (<SEMICOLON> | "?>")
+ {
+ if (currentSegment != null) {
+ currentSegment.add(new PHPReqIncDeclaration(currentSegment, token.image,pos,expr));
+ }
+ }
+ try {
+ <SEMICOLON>
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
}
String PrintExpression() :
{
- StringBuffer buff = new StringBuffer("print ");
- String expr;
+ final StringBuffer buff = new StringBuffer("print ");
+ final String expr;
}
{
<PRINT> expr = Expression()
}
}
+String ListExpression() :
+{
+ final StringBuffer buff = new StringBuffer("list(");
+ String expr;
+}
+{
+ <LIST>
+ try {
+ <LPAREN>
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ [
+ expr = VariableDeclaratorId()
+ {buff.append(expr);}
+ ]
+ (
+ try {
+ <COMMA>
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ expr = VariableDeclaratorId()
+ {buff.append(",").append(expr);}
+ )*
+ {buff.append(")");}
+ try {
+ <RPAREN>
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ [ <ASSIGN> expr = Expression() {buff.append("(").append(expr);}]
+ {return buff.toString();}
+}
+
+/**
+ * An echo statement is like this : echo anyexpression (, otherexpression)*
+ */
void EchoStatement() :
{}
{
<ECHO> Expression() (<COMMA> Expression())*
try {
- (<SEMICOLON> | "?>")
+ <SEMICOLON>
} catch (ParseException e) {
- errorMessage = "';' expected after 'echo' statement";
- errorLevel = ERROR;
- throw e;
+ if (e.currentToken.next.kind != 4) {
+ errorMessage = "';' expected after 'echo' statement";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
}
}
void GlobalStatement() :
-{}
{
- <GLOBAL> VariableDeclaratorId() (<COMMA> VariableDeclaratorId())* (<SEMICOLON> | "?>")
+ final int pos = jj_input_stream.getPosition();
+ String expr;
+}
+{
+ <GLOBAL>
+ expr = VariableDeclaratorId()
+ {if (currentSegment != null) {
+ currentSegment.add(new PHPGlobalDeclaration(currentSegment, "global",pos,expr));
+ }}
+ (<COMMA>
+ expr = VariableDeclaratorId()
+ {if (currentSegment != null) {
+ currentSegment.add(new PHPGlobalDeclaration(currentSegment, "global",pos,expr));
+ }}
+ )*
+ try {
+ <SEMICOLON>
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
}
void StaticStatement() :
{}
{
- <STATIC> VariableDeclarator() (<COMMA> VariableDeclarator())* (<SEMICOLON> | "?>")
+ <STATIC> VariableDeclarator() (<COMMA> VariableDeclarator())*
+ try {
+ <SEMICOLON>
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
}
void LabeledStatement() :
} catch (ParseException e) {
errorMessage = "'{' expected";
errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ ( BlockStatement() | htmlBlock())*
+ try {
+ <RBRACE>
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.image +"', '}' expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
throw e;
}
- ( BlockStatement() )*
- <RBRACE>
}
void BlockStatement() :
MethodDeclaration()
}
+/**
+ * A Block statement that will not contain any 'break'
+ */
+void BlockStatementNoBreak() :
+{}
+{
+ StatementNoBreak()
+|
+ ClassDeclaration()
+|
+ MethodDeclaration()
+}
+
void LocalVariableDeclaration() :
{}
{
- VariableDeclarator() ( <COMMA> VariableDeclarator() )*
+ LocalVariableDeclarator() ( <COMMA> LocalVariableDeclarator() )*
+}
+
+void LocalVariableDeclarator() :
+{}
+{
+ VariableDeclaratorId() [ <ASSIGN> Expression() ]
}
void EmptyStatement() :
}
void StatementExpression() :
-/*
- * The last expansion of this production accepts more than the legal
- * Java expansions for StatementExpression. This expansion does not
- * use PostfixExpression for performance reasons.
- */
{}
{
- PreIncrementExpression()
-|
- PreDecrementExpression()
+ PreIncDecExpression()
|
PrimaryExpression()
[
}
void SwitchStatement() :
-{}
{
- <SWITCH> <LPAREN> Expression() <RPAREN> <LBRACE>
- ( SwitchLabel() ( BlockStatement() )* )*
- <RBRACE>
+ final int pos = jj_input_stream.getPosition();
+}
+{
+ <SWITCH>
+ try {
+ <LPAREN>
+ } catch (ParseException e) {
+ errorMessage = "'(' expected after 'switch'";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ Expression()
+ try {
+ <RPAREN>
+ } catch (ParseException e) {
+ errorMessage = "')' expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ (switchStatementBrace() | switchStatementColon(pos, pos + 6))
}
-void SwitchLabel() :
+void switchStatementBrace() :
{}
{
- <CASE> Expression() <COLON>
+ <LBRACE>
+ ( switchLabel0() )*
+ try {
+ <RBRACE>
+ } catch (ParseException e) {
+ errorMessage = "'}' expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+}
+/**
+ * A Switch statement with : ... endswitch;
+ * @param start the begin offset of the switch
+ * @param end the end offset of the switch
+ */
+void switchStatementColon(final int start, final int end) :
+{}
+{
+ <COLON>
+ {try {
+ setMarker(fileToParse,
+ "Ugly syntax detected, you should switch () {...} instead of switch (): ... enswitch;",
+ start,
+ end,
+ INFO,
+ "Line " + token.beginLine);
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }}
+ (switchLabel0())*
+ try {
+ <ENDSWITCH>
+ } catch (ParseException e) {
+ errorMessage = "'endswitch' expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ try {
+ <SEMICOLON>
+ } catch (ParseException e) {
+ errorMessage = "';' expected after 'endswitch' keyword";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+}
+
+void switchLabel0() :
+{
+ Token breakToken = null;
+ final int line;
+}
+{
+ line = SwitchLabel()
+ ( BlockStatementNoBreak() | htmlBlock() )*
+ [ breakToken = BreakStatement() ]
+ {
+ try {
+ if (breakToken == null) {
+ setMarker(fileToParse,
+ "You should use put a 'break' at the end of your statement",
+ line,
+ INFO,
+ "Line " + line);
+ }
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }
+ }
+}
+
+Token BreakStatement() :
+{
+ final Token token;
+}
+{
+ token = <BREAK> [ Expression() ]
+ try {
+ <SEMICOLON>
+ } catch (ParseException e) {
+ errorMessage = "';' expected after 'break' keyword";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ {return token;}
+}
+
+int SwitchLabel() :
+{
+ final Token token;
+}
+{
+ token = <CASE>
+ try {
+ Expression()
+ } catch (ParseException e) {
+ if (errorMessage != null) throw e;
+ errorMessage = "expression expected after 'case' keyword";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ try {
+ <COLON>
+ } catch (ParseException e) {
+ errorMessage = "':' expected after case expression";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ {return token.beginLine;}
|
- <_DEFAULT> <COLON>
+ token = <_DEFAULT>
+ try {
+ <COLON>
+ } catch (ParseException e) {
+ errorMessage = "':' expected after 'default' keyword";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ {return token.beginLine;}
}
void IfStatement() :
-/*
- * The disambiguating algorithm of JavaCC automatically binds dangling
- * else's to the innermost if statement. The LOOKAHEAD specification
- * is to tell JavaCC that we know what we are doing.
- */
-{}
{
- <IF> Condition("if") Statement() ( LOOKAHEAD(1) ElseIfStatement() )* [ LOOKAHEAD(1) <ELSE> Statement() ]
+ final Token token;
+ final int pos = jj_input_stream.getPosition();
+}
+{
+ token = <IF> Condition("if") IfStatement0(pos,pos+token.image.length())
}
-void Condition(String keyword) :
+void Condition(final String keyword) :
{}
{
try {
} catch (ParseException e) {
errorMessage = "'(' expected after " + keyword + " keyword";
errorLevel = ERROR;
- throw e;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length();
+ errorEnd = errorStart +1;
+ processParseException(e);
}
Expression()
try {
} catch (ParseException e) {
errorMessage = "')' expected after " + keyword + " keyword";
errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+}
+
+void IfStatement0(final int start,final int end) :
+{}
+{
+ <COLON> (Statement() | htmlBlock())* (ElseIfStatementColon())* [ElseStatementColon()]
+
+ {try {
+ setMarker(fileToParse,
+ "Ugly syntax detected, you should if () {...} instead of if (): ... endif;",
+ start,
+ end,
+ INFO,
+ "Line " + token.beginLine);
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }}
+ try {
+ <ENDIF>
+ } catch (ParseException e) {
+ errorMessage = "'endif' expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
throw e;
}
+ try {
+ <SEMICOLON>
+ } catch (ParseException e) {
+ errorMessage = "';' expected after 'endif' keyword";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+|
+ (Statement() | htmlBlock())
+ ( LOOKAHEAD(1) ElseIfStatement() )*
+ [ LOOKAHEAD(1)
+ <ELSE>
+ try {
+ Statement()
+ } catch (ParseException e) {
+ if (errorMessage != null) {
+ throw e;
+ }
+ errorMessage = "unexpected token '"+e.currentToken.next.image+"', a statement was expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ ]
+}
+
+void ElseIfStatementColon() :
+{}
+{
+ <ELSEIF> Condition("elseif") <COLON> (Statement() | htmlBlock())*
+}
+
+void ElseStatementColon() :
+{}
+{
+ <ELSE> <COLON> (Statement() | htmlBlock())*
}
void ElseIfStatement() :
}
void WhileStatement() :
-{}
{
- <WHILE> Condition("while") WhileStatement0()
+ final Token token;
+ final int pos = jj_input_stream.getPosition();
+}
+{
+ token = <WHILE> Condition("while") WhileStatement0(pos,pos + token.image.length())
}
-void WhileStatement0() :
+void WhileStatement0(final int start, final int end) :
{}
{
- <COLON> (Statement())* <ENDWHILE> (<SEMICOLON> | "?>")
+ <COLON> (Statement())*
+ {try {
+ setMarker(fileToParse,
+ "Ugly syntax detected, you should while () {...} instead of while (): ... endwhile;",
+ start,
+ end,
+ INFO,
+ "Line " + token.beginLine);
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }}
+ try {
+ <ENDWHILE>
+ } catch (ParseException e) {
+ errorMessage = "'endwhile' expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ try {
+ <SEMICOLON>
+ } catch (ParseException e) {
+ errorMessage = "';' expected after 'endwhile' keyword";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
|
Statement()
}
void DoStatement() :
{}
{
- <DO> Statement() <WHILE> Condition("while") (<SEMICOLON> | "?>")
+ <DO> Statement() <WHILE> Condition("while")
+ try {
+ <SEMICOLON>
+ } catch (ParseException e) {
+ errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+}
+
+void ForeachStatement() :
+{}
+{
+ <FOREACH>
+ try {
+ <LPAREN>
+ } catch (ParseException e) {
+ errorMessage = "'(' expected after 'foreach' keyword";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ try {
+ Variable()
+ } catch (ParseException e) {
+ errorMessage = "variable expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ ( VariableSuffix() )*
+ try {
+ <AS>
+ } catch (ParseException e) {
+ errorMessage = "'as' expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ try {
+ Variable()
+ } catch (ParseException e) {
+ errorMessage = "variable expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ [ <ARRAYASSIGN> Expression() ]
+ try {
+ <RPAREN>
+ } catch (ParseException e) {
+ errorMessage = "')' expected after 'foreach' keyword";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ try {
+ Statement()
+ } catch (ParseException e) {
+ if (errorMessage != null) throw e;
+ errorMessage = "statement expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
}
void ForStatement() :
-{}
{
- <FOR> <LPAREN> [ ForInit() ] <SEMICOLON> [ Expression() ] <SEMICOLON> [ ForUpdate() ] <RPAREN> Statement()
+final Token token;
+final int pos = jj_input_stream.getPosition();
+}
+{
+ token = <FOR>
+ try {
+ <LPAREN>
+ } catch (ParseException e) {
+ errorMessage = "'(' expected after 'for' keyword";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ [ ForInit() ] <SEMICOLON> [ Expression() ] <SEMICOLON> [ StatementExpressionList() ] <RPAREN>
+ (
+ Statement()
+ |
+ <COLON> (Statement())*
+ {
+ try {
+ setMarker(fileToParse,
+ "Ugly syntax detected, you should for () {...} instead of for (): ... endfor;",
+ pos,
+ pos+token.image.length(),
+ INFO,
+ "Line " + token.beginLine);
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }
+ }
+ try {
+ <ENDFOR>
+ } catch (ParseException e) {
+ errorMessage = "'endfor' expected";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ try {
+ <SEMICOLON>
+ } catch (ParseException e) {
+ errorMessage = "';' expected after 'endfor' keyword";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
+ )
}
void ForInit() :
StatementExpression() ( <COMMA> StatementExpression() )*
}
-void ForUpdate() :
-{}
-{
- StatementExpressionList()
-}
-
-void BreakStatement() :
-{}
-{
- <BREAK> [ <IDENTIFIER> ] <SEMICOLON>
-}
-
void ContinueStatement() :
{}
{
- <CONTINUE> [ <IDENTIFIER> ] <SEMICOLON>
+ <CONTINUE> [ Expression() ]
+ try {
+ <SEMICOLON>
+ } catch (ParseException e) {
+ errorMessage = "';' expected after 'continue' statement";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
}
void ReturnStatement() :
{}
{
- <RETURN> [ Expression() ] <SEMICOLON>
+ <RETURN> [ Expression() ]
+ try {
+ <SEMICOLON>
+ } catch (ParseException e) {
+ errorMessage = "';' expected after 'return' statement";
+ errorLevel = ERROR;
+ errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = jj_input_stream.getPosition() + 1;
+ throw e;
+ }
}
\ No newline at end of file
git://secure.phpeclipse.com / phpeclipse.git / blobdiff