X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/phpparser/PHPParser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/phpparser/PHPParser.java index 7e87efa..c5a29c0 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/phpparser/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/phpparser/PHPParser.java @@ -19,6 +19,7 @@ import net.sourceforge.phpeclipse.PHPeclipsePlugin; import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; import net.sourceforge.phpeclipse.phpeditor.PHPString; import net.sourceforge.phpeclipse.phpeditor.php.PHPKeywords; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; @@ -197,6 +198,12 @@ public class PHPParser extends PHPKeywords { } } + /** + * This method will throw the SyntaxError. + * It will add the good lines and columns to the Error + * @param error the error message + * @throws SyntaxError the error raised + */ private void throwSyntaxError(String error) { if (str.length() < chIndx) { @@ -214,8 +221,13 @@ public class PHPParser extends PHPKeywords { throw new SyntaxError(rowCount, chIndx - columnCount + 1, str.substring(columnCount, eol), error); } + /** + * This method will throw the SyntaxError. + * It will add the good lines and columns to the Error + * @param error the error message + * @throws SyntaxError the error raised + */ private void throwSyntaxError(String error, int startRow) { - throw new SyntaxError(startRow, 0, " ", error); } @@ -1264,7 +1276,9 @@ public class PHPParser extends PHPKeywords { // } } - + /** + * Get an identifier. + */ private void getIdentifier() { // StringBuffer ident = new StringBuffer(); int startPosition = chIndx - 1; @@ -1280,11 +1294,13 @@ public class PHPParser extends PHPKeywords { } getChar(); + + //this will read the buffer until the next character is a forbidden character for identifier while ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9') || (ch == '_')) { // ident.append(ch); getChar(); } - int endPosition = chIndx--; + int endPosition = chIndx--; int length = (--endPosition) - startPosition; identifier = str.substring(startPosition, endPosition); @@ -1298,6 +1314,13 @@ public class PHPParser extends PHPKeywords { } } + /** + * Get a number. + * if it's a double the number will be stored in doubleNumber and the token will have the + * value {@link PHPParser#TT_DOUBLE_NUMBER}
+ * if it's a double the number will be stored in longNumber and the token will have the + * value {@link PHPParser#TT_INT_NUMBER} + */ private void getNumber() { StringBuffer inum = new StringBuffer(); char dFlag = ' '; @@ -3298,6 +3321,10 @@ public class PHPParser extends PHPKeywords { } } + /** + * It will look for a value (after a '=' for example) + * @throws CoreException + */ private void constant() throws CoreException { String ident; switch (token) { @@ -3381,9 +3408,9 @@ public class PHPParser extends PHPKeywords { MessageFormat form = new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF)); String command = form.format(arguments); - String parserResult = PHPStartApacheAction.execute(command, "External parser: "); + String parserResult = PHPStartApacheAction.getParserOutput(command, "External parser: "); - try { + try { // parse the buffer to find the errors and warnings createMarkers(parserResult, file); } catch (CoreException e) {