X-Git-Url: http://git.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 981cd7f..7e9ede4 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 @@ -14,6 +14,7 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.Hashtable; +import java.util.Stack; import net.sourceforge.phpeclipse.PHPeclipsePlugin; import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; @@ -171,22 +172,23 @@ public class PHPParser extends PHPKeywords { } public static void setMarker(IFile file, String message, int lineNumber, int errorLevel) throws CoreException { - - 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; + 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; + } + MarkerUtilities.setLineNumber(attributes, lineNumber); + MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM); } - MarkerUtilities.setLineNumber(attributes, lineNumber); - MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM); } private void throwSyntaxError(String error) { @@ -1691,7 +1693,7 @@ public class PHPParser extends PHPKeywords { } /** - * Parses a string with php tAGS + * Parses a string with php tags * i.e. '<body> <?php phpinfo() ?> </body>' */ public void parse(String s) throws CoreException { @@ -1756,6 +1758,75 @@ public class PHPParser extends PHPKeywords { while (true); } + public PHPOutlineInfo parseInfo(Object parent, String s) { + PHPOutlineInfo outlineInfo = new PHPOutlineInfo(parent); + // Stack stack = new Stack(); + // stack.push(outlineInfo.getDeclarations()); + + this.str = s; + this.token = TT_EOF; + this.chIndx = 0; + this.rowCount = 1; + this.columnCount = 0; + this.phpEnd = false; + this.phpMode = false; + + try { + getNextToken(); + parseDeclarations(outlineInfo, outlineInfo.getDeclarations(), false); + } catch (CoreException e) { + } + return outlineInfo; + } + + private void parseDeclarations(PHPOutlineInfo outlineInfo, PHPClassDeclaration current, boolean goBack) { + // PHPClassDeclaration current = (PHPClassDeclaration) stack.peek(); + PHPClassDeclaration temp; + int counter = 0; + + try { + while (token != TT_EOF && token != TT_UNDEFINED) { + if (token == TT_VARIABLE) { + outlineInfo.addVariable(identifier); + getNextToken(); + } else if (token == TT_function) { + getNextToken(); + if (token == TT_IDENTIFIER) { + outlineInfo.addVariable(identifier); + current.add(new PHPFunctionDeclaration(current, identifier, chIndx - identifier.length())); + getNextToken(); + } + } else if (token == TT_class) { + getNextToken(); + if (token == TT_IDENTIFIER) { + outlineInfo.addVariable(identifier); + temp = new PHPClassDeclaration(current, identifier, chIndx - identifier.length()); + current.add(temp); + // stack.push(temp); + getNextToken(); + while (token != TT_LISTOPEN && token != TT_EOF && token != TT_UNDEFINED) { + getNextToken(); + } + parseDeclarations(outlineInfo, temp, true); + // stack.pop(); + } + } else if (token == TT_LISTOPEN) { + getNextToken(); + counter++; + } else if (token == TT_LISTCLOSE) { + getNextToken(); + --counter; + if (counter == 0 && goBack) { + return; + } + } else { + getNextToken(); + } + } + } catch (CoreException e) { + } + } + private void statementList() throws CoreException { do { statement();