X-Git-Url: http://git.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
index a6bce7c..e69a928 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -29,25 +29,26 @@ import org.eclipse.ui.texteditor.MarkerUtilities;
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.*;
/**
* 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 */
@@ -55,28 +56,33 @@ public class PHPParser extends PHPParserSuperclass {
private static final String PARSE_ERROR_STRING = "Parse error"; //$NON-NLS-1$
private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
- public static final int ERROR = 2;
- public static final int WARNING = 1;
- public static final int INFO = 0;
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);
}
@@ -84,8 +90,21 @@ public class PHPParser extends PHPParserSuperclass {
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);
}
@@ -93,10 +112,10 @@ public class PHPParser extends PHPParserSuperclass {
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);
}
@@ -104,57 +123,64 @@ public class PHPParser extends PHPParserSuperclass {
try {
parse();
} catch (ParseException e) {
- if (errorMessage == null) {
- PHPeclipsePlugin.log(e);
- } else {
- setMarker(errorMessage, e.currentToken.beginLine, errorLevel);
- errorMessage = null;
- }
+ processParseException(e);
}
return outlineInfo;
}
-
/**
- * Create marker for the parse error
+ * 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 setMarker(String message, int lineNumber, int errorLevel) {
- try {
- setMarker(fileToParse, message, lineNumber, errorLevel);
- } catch (CoreException e) {
+ private static void processParseException(final ParseException e) {
+ 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;
}
- public static void setMarker(IFile file, String message, int lineNumber, int errorLevel) throws CoreException {
- if (file != null) {
- Hashtable attributes = new Hashtable();
- MarkerUtilities.setMessage(attributes, message);
- switch (errorLevel) {
- case ERROR :
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR));
- break;
- case WARNING :
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING));
- break;
- case INFO :
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO));
- break;
+ /**
+ * Create marker for the parse error
+ * @param e the ParseException
+ */
+ private static void setMarker(final ParseException e) {
+ try {
+ 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;
}
- MarkerUtilities.setLineNumber(attributes, lineNumber);
- MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM);
+ } 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("
", indx)) != -1) {
// newer php error output (tested with 4.2.3)
@@ -171,7 +197,10 @@ public class PHPParser extends PHPParserSuperclass {
}
}
- 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;
@@ -209,17 +238,16 @@ public class PHPParser extends PHPParserSuperclass {
}
}
- 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) {
- if (errorMessage == null) {
- PHPeclipsePlugin.log(e);
- } else {
- setMarker(errorMessage, e.currentToken.beginLine, errorLevel);
- errorMessage = null;
- }
+ processParseException(e);
}
}
@@ -227,15 +255,15 @@ public class PHPParser extends PHPParserSuperclass {
* 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
@@ -245,7 +273,7 @@ public class PHPParser extends PHPParserSuperclass {
}
}
- public void parse() throws ParseException {
+ public static final void parse() throws ParseException {
phpFile();
}
}
@@ -254,7 +282,9 @@ PARSER_END(PHPParser)
TOKEN :
{
- : PHPPARSING
+ : PHPPARSING
+| : PHPPARSING
+| "> : DEFAULT
}
+/* Skip any character if we are not in php mode */
SKIP :
{
< ~[] >
@@ -269,7 +300,6 @@ PARSER_END(PHPParser)
/* WHITE SPACE */
-
SKIP :
{
" "
@@ -280,20 +310,25 @@ PARSER_END(PHPParser)
}
/* COMMENTS */
-
- MORE :
+ SPECIAL_TOKEN :
{
"//" : IN_SINGLE_LINE_COMMENT
|
+ "#" : IN_SINGLE_LINE_COMMENT
+|
<"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT
|
"/*" : IN_MULTI_LINE_COMMENT
}
-
-SPECIAL_TOKEN :
+ SPECIAL_TOKEN :
+{
+ : PHPPARSING
+}
+
+ SPECIAL_TOKEN :
{
- " > : PHPPARSING
+ " > : DEFAULT
}
@@ -324,72 +359,76 @@ MORE :
|
|
|
+|
+|
}
/* LANGUAGE CONSTRUCT */
TOKEN :
{
-
-|
-|
-|
-|
-|
-|
-|
-| ">
-|
-| ">
+
+|
+|
+|
+|
+|
+|
+|
+| ">
+|
+| ">
}
/* RESERVED WORDS AND LITERALS */
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" >
+
+|
+|
+| <_DEFAULT : "default">
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
}
/* TYPES */
-
TOKEN :
{
-
-|