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 e411485..0f04260 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -29,15 +29,17 @@ import org.eclipse.ui.texteditor.MarkerUtilities;
import org.eclipse.jface.preference.IPreferenceStore;
import java.util.Hashtable;
-import java.util.Enumeration;
+import java.util.ArrayList;
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.*;
import net.sourceforge.phpdt.internal.compiler.ast.*;
+import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren;
+import net.sourceforge.phpdt.internal.compiler.parser.Outlineable;
+import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
/**
* A new php parser.
@@ -45,6 +47,7 @@ import net.sourceforge.phpdt.internal.compiler.ast.*;
* given with JavaCC. You can get JavaCC at http://www.webgain.com
* You can test the parser with the PHPParserTestCase2.java
* @author Matthieu Casanova
+ * @version $Reference: 1.0$
*/
public final class PHPParser extends PHPParserSuperclass {
@@ -52,14 +55,11 @@ public final class PHPParser extends PHPParserSuperclass {
private static IFile fileToParse;
/** The current segment. */
- private static PHPSegmentWithChildren currentSegment;
+ private static OutlineableWithChildren currentSegment;
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;
- private static boolean assigning;
+ static PHPOutlineInfo outlineInfo;
/** The error level of the current ParseException. */
private static int errorLevel = ERROR;
@@ -68,13 +68,21 @@ public final class PHPParser extends PHPParserSuperclass {
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 static int htmlStart;
- //ast stack
- private final static int AstStackIncrement = 100;
- /** The stack of node. */
- private static AstNode[] astStack;
+ //ast stack
+ private final static int AstStackIncrement = 100;
+ /** The stack of node. */
+ private static AstNode[] nodes;
/** The cursor in expression stack. */
- private static int expressionPtr;
+ private static int nodePtr;
public final void setFileToParse(final IFile fileToParse) {
this.fileToParse = fileToParse;
@@ -88,52 +96,49 @@ public final class PHPParser extends PHPParserSuperclass {
this.fileToParse = fileToParse;
}
- public static final void phpParserTester(final String strEval) throws CoreException, ParseException {
- PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING);
- final StringReader stream = new StringReader(strEval);
- if (jj_input_stream == null) {
- jj_input_stream = new SimpleCharStream(stream, 1, 1);
- }
- ReInit(new StringReader(strEval));
- astStack = new AstNode[AstStackIncrement];
- phpTest();
+ /**
+ * Reinitialize the parser.
+ */
+ private static final void init() {
+ nodes = new AstNode[AstStackIncrement];
+ nodePtr = -1;
+ htmlStart = 0;
}
- public static final void htmlParserTester(final File fileName) throws CoreException, ParseException {
+ /**
+ * Add an php node on the stack.
+ * @param node the node that will be added to the stack
+ */
+ private static final void pushOnAstNodes(final AstNode node) {
try {
- final Reader stream = new FileReader(fileName);
- if (jj_input_stream == null) {
- jj_input_stream = new SimpleCharStream(stream, 1, 1);
- }
- ReInit(stream);
- astStack = new AstNode[AstStackIncrement];
- 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);
+ nodes[++nodePtr] = node;
+ } catch (IndexOutOfBoundsException e) {
+ final int oldStackLength = nodes.length;
+ final AstNode[] oldStack = nodes;
+ nodes = new AstNode[oldStackLength + AstStackIncrement];
+ System.arraycopy(oldStack, 0, nodes, 0, oldStackLength);
+ nodePtr = oldStackLength;
+ nodes[nodePtr] = node;
}
- ReInit(stream);
- astStack = new AstNode[AstStackIncrement];
- phpFile();
}
public final PHPOutlineInfo parseInfo(final Object parent, final String s) {
- outlineInfo = new PHPOutlineInfo(parent);
- currentSegment = outlineInfo.getDeclarations();
+ phpDocument = new PHPDocument(parent,"_root".toCharArray());
+ currentSegment = phpDocument;
+ outlineInfo = new PHPOutlineInfo(parent, currentSegment);
final StringReader stream = new StringReader(s);
if (jj_input_stream == null) {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
}
ReInit(stream);
- astStack = new AstNode[AstStackIncrement];
+ init();
try {
parse();
+ 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);
}
@@ -149,11 +154,12 @@ public final class PHPParser extends PHPParserSuperclass {
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();
+ errorStart = SimpleCharStream.getPosition();
errorEnd = errorStart + 1;
}
setMarker(e);
errorMessage = null;
+ if (PHPeclipsePlugin.DEBUG) PHPeclipsePlugin.log(e);
}
/**
@@ -165,8 +171,8 @@ public final class PHPParser extends PHPParserSuperclass {
if (errorStart == -1) {
setMarker(fileToParse,
errorMessage,
- jj_input_stream.tokenBegin,
- jj_input_stream.tokenBegin + e.currentToken.image.length(),
+ SimpleCharStream.tokenBegin,
+ SimpleCharStream.tokenBegin + e.currentToken.image.length(),
errorLevel,
"Line " + e.currentToken.beginLine);
} else {
@@ -184,31 +190,6 @@ public final class PHPParser extends PHPParserSuperclass {
}
}
- /**
- * Create markers according to the external parser output
- */
- 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;
- boolean flag = true;
- while ((brIndx = output.indexOf("
", indx)) != -1) {
- // newer php error output (tested with 4.2.3)
- scanLine(output, file, indx, brIndx);
- indx = brIndx + 6;
- flag = false;
- }
- if (flag) {
- while ((brIndx = output.indexOf("
", indx)) != -1) {
- // older php error output (tested with 4.2.3)
- scanLine(output, file, indx, brIndx);
- indx = brIndx + 4;
- }
- }
- }
-
private static void scanLine(final String output,
final IFile file,
final int indx,
@@ -256,7 +237,7 @@ public final class PHPParser extends PHPParserSuperclass {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
}
ReInit(stream);
- astStack = new AstNode[AstStackIncrement];
+ init();
try {
parse();
} catch (ParseException e) {
@@ -286,6 +267,37 @@ public final class PHPParser extends PHPParserSuperclass {
}
}
+ /**
+ * Put a new html block in the stack.
+ */
+ public static final void createNewHTMLCode() {
+ final int currentPosition = SimpleCharStream.getPosition();
+ if (currentPosition == htmlStart || currentPosition > SimpleCharStream.currentBuffer.length()) {
+ return;
+ }
+ final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition+1).toCharArray();
+ pushOnAstNodes(new HTMLCode(chars, htmlStart,currentPosition));
+ }
+
+ /**
+ * Create a new task.
+ */
+ public static final void createNewTask() {
+ final int currentPosition = SimpleCharStream.getPosition();
+ final String todo = SimpleCharStream.currentBuffer.substring(currentPosition+1,
+ SimpleCharStream.currentBuffer.indexOf("\n",
+ currentPosition)-1);
+ try {
+ setMarker(fileToParse,
+ "todo : " + todo,
+ SimpleCharStream.getBeginLine(),
+ TASK,
+ "Line "+SimpleCharStream.getBeginLine());
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }
+ }
+
private static final void parse() throws ParseException {
phpFile();
}
@@ -295,14 +307,14 @@ PARSER_END(PHPParser)
TOKEN :
{
- : PHPPARSING
-| : PHPPARSING
-| : PHPPARSING
+ {PHPParser.createNewHTMLCode();} : PHPPARSING
+| {PHPParser.createNewHTMLCode();} : PHPPARSING
+| {PHPParser.createNewHTMLCode();} : PHPPARSING
}
TOKEN :
{
- "> : DEFAULT
+ "> {PHPParser.htmlStart = SimpleCharStream.getPosition();} : DEFAULT
}
/* Skip any character if we are not in php mode */
@@ -326,34 +338,30 @@ PARSER_END(PHPParser)
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
+| <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT
+| "/*" : IN_MULTI_LINE_COMMENT
}
SPECIAL_TOKEN :
{
: PHPPARSING
+| "?>" : DEFAULT
}
- SPECIAL_TOKEN :
+ SPECIAL_TOKEN :
{
- " > : DEFAULT
+ "todo" {PHPParser.createNewTask();}
}
-
-SPECIAL_TOKEN :
+ SPECIAL_TOKEN :
{
- : PHPPARSING
+ "*/" : PHPPARSING
}
-
-SPECIAL_TOKEN :
+ SPECIAL_TOKEN :
{
- : PHPPARSING
+ "*/" : PHPPARSING
}
@@ -386,6 +394,7 @@ MORE :
|
|
|
+|
|
| ">
|
@@ -435,73 +444,74 @@ MORE :
|
}
+//Misc token
+ TOKEN :
+{
+
+|
+|
+|
+|
+|
+}
+
+/* OPERATORS */
TOKEN :
{
- <_ORL : "OR">
-| <_ANDL : "AND">
+
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+| >">
+| >>">
+| <_ORL : "OR">
+| <_ANDL : "AND">
}
/* LITERALS */
TOKEN :
{
- < INTEGER_LITERAL:
+ (["l","L"])?
| (["l","L"])?
| (["l","L"])?
>
|
- < #DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* >
+ <#DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* >
|
- < #HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ >
+ <#HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ >
|
- < #OCTAL_LITERAL: "0" (["0"-"7"])* >
+ <#OCTAL_LITERAL: "0" (["0"-"7"])* >
|
- < FLOATING_POINT_LITERAL:
+ )? (["f","F","d","D"])?
| "." (["0"-"9"])+ ()? (["f","F","d","D"])?
| (["0"-"9"])+ (["f","F","d","D"])?
| (["0"-"9"])+ ()? ["f","F","d","D"]
>
|
- < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
+ <#EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
|
- < STRING_LITERAL: ( | | )>
-| < STRING_1:
- "\""
- (
- ~["\""] | ~["{"]
- |
- "\\\""
- | "{" ~["\""] "}"
- )*
- "\""
- >
-| < STRING_2:
- "'"
- (
- ~["'"]
- |
- "\\'"
- )*
-
- "'"
- >
-| < STRING_3:
- "`"
- (
- ~["`"]
- |
- "\\`"
- )*
- "`"
- >
+ | | )>
+|
+|
+|
}
/* IDENTIFIERS */
TOKEN :
{
- < IDENTIFIER: (|) (||)* >
+ |) (||)* >
|
< #LETTER:
["a"-"z"] | ["A"-"Z"]
@@ -537,10 +547,10 @@ MORE :
{
">
|
-|
+|
|
| =">
-|
+|
| ">
|
|
@@ -560,46 +570,13 @@ MORE :
|
|
|
-}
-
-/* OPERATORS */
- TOKEN :
-{
-
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-| >">
-| >>">
|
| >=">
}
TOKEN :
{
- < DOLLAR_ID: >
-}
-
-void phpTest() :
-{}
-{
- Php()
-
+ >
}
void phpFile() :
@@ -607,7 +584,7 @@ void phpFile() :
{
try {
(PhpBlock())*
-
+ {PHPParser.createNewHTMLCode();}
} catch (TokenMgrError e) {
PHPeclipsePlugin.log(e);
errorStart = SimpleCharStream.getPosition();
@@ -625,18 +602,20 @@ void phpFile() :
*/
void PhpBlock() :
{
- final int start = jj_input_stream.getPosition();
+ final int start = SimpleCharStream.getPosition();
+ final PHPEchoBlock phpEchoBlock;
}
{
- phpEchoBlock()
+ phpEchoBlock = phpEchoBlock()
+ {pushOnAstNodes(phpEchoBlock);}
|
- [
+ [
|
{try {
setMarker(fileToParse,
"You should use '' expected";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
- throw e;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseException(e);
}
}
-void phpEchoBlock() :
-{}
+PHPEchoBlock phpEchoBlock() :
+{
+ final Expression expr;
+ final int pos = SimpleCharStream.getPosition();
+ final PHPEchoBlock echoBlock;
+}
{
- Expression() [ ]
+ expr = Expression() [ ]
+ {
+ echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition());
+ pushOnAstNodes(echoBlock);
+ return echoBlock;}
}
void Php() :
@@ -667,52 +654,65 @@ void Php() :
(BlockStatement())*
}
-void ClassDeclaration() :
+ClassDeclaration ClassDeclaration() :
{
- final PHPClassDeclaration classDeclaration;
- final Token className;
+ final ClassDeclaration classDeclaration;
+ final Token className,superclassName;
final int pos;
+ char[] classNameImage = SYNTAX_ERROR_CHAR;
+ char[] superclassNameImage = null;
}
{
+ {pos = SimpleCharStream.getPosition();}
try {
- {pos = jj_input_stream.getPosition();}
className =
+ {classNameImage = className.image.toCharArray();}
} 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;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseException(e);
}
[
try {
-
+ superclassName =
+ {superclassNameImage = superclassName.image.toCharArray();}
} 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;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseException(e);
+ superclassNameImage = SYNTAX_ERROR_CHAR;
}
]
{
- if (currentSegment != null) {
- classDeclaration = new PHPClassDeclaration(currentSegment,className.image,pos);
+ if (superclassNameImage == null) {
+ classDeclaration = new ClassDeclaration(currentSegment,
+ classNameImage,
+ pos,
+ 0);
+ } else {
+ classDeclaration = new ClassDeclaration(currentSegment,
+ classNameImage,
+ superclassNameImage,
+ pos,
+ 0);
+ }
currentSegment.add(classDeclaration);
currentSegment = classDeclaration;
- }
- }
- ClassBody()
- {
- if (currentSegment != null) {
- currentSegment = (PHPSegmentWithChildren) currentSegment.getParent();
- }
}
+ ClassBody(classDeclaration)
+ {currentSegment = (OutlineableWithChildren) currentSegment.getParent();
+ classDeclaration.sourceEnd = SimpleCharStream.getPosition();
+ pushOnAstNodes(classDeclaration);
+ return classDeclaration;}
}
-void ClassBody() :
+void ClassBody(final ClassDeclaration classDeclaration) :
{}
{
try {
@@ -720,18 +720,18 @@ void ClassBody() :
} 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;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
- ( ClassBodyDeclaration() )*
+ ( ClassBodyDeclaration(classDeclaration) )*
try {
} catch (ParseException e) {
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;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
}
@@ -739,278 +739,280 @@ void ClassBody() :
/**
* A class can contain only methods and fields.
*/
-void ClassBodyDeclaration() :
-{}
+void ClassBodyDeclaration(final ClassDeclaration classDeclaration) :
{
- MethodDeclaration()
-|
- FieldDeclaration()
+ final MethodDeclaration method;
+ final FieldDeclaration field;
+}
+{
+ method = MethodDeclaration() {classDeclaration.addMethod(method);}
+| field = FieldDeclaration() {classDeclaration.addField(field);}
}
/**
* A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;.
*/
-void FieldDeclaration() :
+FieldDeclaration FieldDeclaration() :
{
- PHPVarDeclaration variableDeclaration;
+ VariableDeclaration variableDeclaration;
+ final VariableDeclaration[] list;
+ final ArrayList arrayList = new ArrayList();
+ final int pos = SimpleCharStream.getPosition();
}
{
variableDeclaration = VariableDeclarator()
- {
- if (currentSegment != null) {
- currentSegment.add(variableDeclaration);
- }
- }
- (
- variableDeclaration = VariableDeclarator()
- {
- if (currentSegment != null) {
- currentSegment.add(variableDeclaration);
- }
- }
+ {arrayList.add(variableDeclaration);
+ outlineInfo.addVariable(new String(variableDeclaration.name));}
+ ( variableDeclaration = VariableDeclarator()
+ {arrayList.add(variableDeclaration);
+ outlineInfo.addVariable(new String(variableDeclaration.name));}
)*
try {
} catch (ParseException e) {
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;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseException(e);
}
+
+ {list = new VariableDeclaration[arrayList.size()];
+ arrayList.toArray(list);
+ return new FieldDeclaration(list,
+ pos,
+ SimpleCharStream.getPosition(),
+ currentSegment);}
}
-PHPVarDeclaration VariableDeclarator() :
+VariableDeclaration VariableDeclarator() :
{
- final String varName, varValue;
- final int pos = jj_input_stream.getPosition();
+ final String varName;
+ Expression initializer = null;
+ final int pos = SimpleCharStream.getPosition();
}
{
varName = VariableDeclaratorId()
[
try {
- varValue = VariableInitializer()
- {return new PHPVarDeclaration(currentSegment,varName,pos,varValue);}
+ initializer = VariableInitializer()
} 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;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
]
- {return new PHPVarDeclaration(currentSegment,varName,pos);}
+ {
+ if (initializer == null) {
+ return new VariableDeclaration(currentSegment,
+ varName.toCharArray(),
+ pos,
+ SimpleCharStream.getPosition());
+ }
+ return new VariableDeclaration(currentSegment,
+ varName.toCharArray(),
+ initializer,
+ pos);
+ }
}
+/**
+ * A Variable name.
+ * @return the variable name (with suffix)
+ */
String VariableDeclaratorId() :
{
- String expr;
- final StringBuffer buff = new StringBuffer();
+ final String expr;
+ Expression expression = null;
+ final int pos = SimpleCharStream.getPosition();
+ ConstantIdentifier ex;
}
{
try {
expr = Variable()
- {buff.append(expr);}
- ( LOOKAHEAD(2) expr = VariableSuffix()
- {buff.append(expr);}
+ ( LOOKAHEAD(2)
+ {ex = new ConstantIdentifier(expr.toCharArray(),
+ pos,
+ SimpleCharStream.getPosition());}
+ expression = VariableSuffix(ex)
)*
- {return buff.toString();}
+ {
+ if (expression == null) {
+ return expr;
+ }
+ return expression.toStringExpression();
+ }
} 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;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
}
+/**
+ * Return a variablename without the $.
+ * @return a variable name
+ */
String Variable():
{
- String expr = null;
+ final StringBuffer buff;
+ Expression expression = null;
final Token token;
+ final String expr;
}
{
- token = [ expr = Expression() ]
+ token = [ expression = Expression() ]
{
- if (expr == null && !assigning) {
- if (currentFunction != null) {
- PHPVarDeclaration var = currentFunction.getParameter(token.image.substring(1));
- if (var != null) {
- var.getVariable().setUsed(true);
- }
- }
+ if (expression == null) {
return token.image.substring(1);
}
- return token + "{" + expr + "}";
+ buff = new StringBuffer(token.image);
+ buff.append("{");
+ buff.append(expression.toStringExpression());
+ buff.append("}");
+ return buff.toString();
}
|
expr = VariableName()
{return expr;}
}
+/**
+ * A Variable name (without the $)
+ * @return a variable name String
+ */
String VariableName():
{
-String expr = null;
-final Token token;
+ final StringBuffer buff;
+ final String expr;
+ Expression expression = null;
+ final Token token;
}
{
- expr = Expression()
- {return "{"+expr+"}";}
+ expression = Expression()
+ {buff = new StringBuffer("{");
+ buff.append(expression.toStringExpression());
+ buff.append("}");
+ return buff.toString();}
|
- token = [ expr = Expression() ]
+ token = [ expression = Expression() ]
{
- if (expr == null) {
- if (currentFunction != null) {
- PHPVarDeclaration var = currentFunction.getParameter(token.image);
- if (var != null) {
- var.getVariable().setUsed(true);
- }
- }
+ if (expression == null) {
return token.image;
}
- return token + "{" + expr + "}";
+ buff = new StringBuffer(token.image);
+ buff.append("{");
+ buff.append(expression.toStringExpression());
+ buff.append("}");
+ return buff.toString();
}
|
expr = VariableName()
{
- if (currentFunction != null) {
- PHPVarDeclaration var = currentFunction.getParameter(expr);
- if (var != null) {
- var.getVariable().setUsed(true);
- }
- }
- return "$" + expr;
+ buff = new StringBuffer("$");
+ buff.append(expr);
+ return buff.toString();
}
|
- token =
- {
- 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 = [expr = VariableName()]
- {
- if (expr == null) {
- return token.image;
- }
- return token.image + expr;
- }*/
+ token = {return token.image;}
}
-String VariableInitializer() :
+Expression VariableInitializer() :
{
- final String expr;
+ final Expression expr;
final Token token;
+ final int pos = SimpleCharStream.getPosition();
}
{
expr = Literal()
{return expr;}
|
(token = | token = )
- {return "-" + token.image;}
+ {return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
+ pos,
+ SimpleCharStream.getPosition()),
+ OperatorIds.MINUS,
+ pos);}
|
(token = | token = )
- {return "+" + token.image;}
+ {return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
+ pos,
+ SimpleCharStream.getPosition()),
+ OperatorIds.PLUS,
+ pos);}
|
expr = ArrayDeclarator()
{return expr;}
|
token =
- {return token.image;}
+ {return new ConstantIdentifier(token.image.toCharArray(),pos,SimpleCharStream.getPosition());}
}
-String ArrayVariable() :
+ArrayVariableDeclaration ArrayVariable() :
{
-String expr;
-final StringBuffer buff = new StringBuffer();
+final Expression expr,expr2;
}
{
expr = Expression()
- {buff.append(expr);}
- [ expr = Expression()
- {buff.append("=>").append(expr);}]
- {return buff.toString();}
+ [ expr2 = Expression()
+ {return new ArrayVariableDeclaration(expr,expr2);}
+ ]
+ {return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());}
}
-String ArrayInitializer() :
+ArrayVariableDeclaration[] ArrayInitializer() :
{
-String expr;
-final StringBuffer buff = new StringBuffer("(");
+ ArrayVariableDeclaration expr;
+ final ArrayList list = new ArrayList();
}
{
[ expr = ArrayVariable()
- {buff.append(expr);}
+ {list.add(expr);}
( LOOKAHEAD(2) expr = ArrayVariable()
- {buff.append(",").append(expr);}
+ {list.add(expr);}
)*
]
- [ {buff.append(",");}]
+ [ {list.add(null);}]
{
- buff.append(")");
- return buff.toString();
- }
+ final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
+ list.toArray(vars);
+ return vars;}
}
/**
* A Method Declaration.
* function MetodDeclarator() Block()
*/
-void MethodDeclaration() :
+MethodDeclaration MethodDeclaration() :
{
- final PHPFunctionDeclaration functionDeclaration;
- Token functionToken;
+ final MethodDeclaration functionDeclaration;
+ final Block block;
+ final OutlineableWithChildren seg = currentSegment;
}
{
- functionToken =
+
try {
functionDeclaration = MethodDeclarator()
+ {outlineInfo.addVariable(new String(functionDeclaration.name));}
} catch (ParseException e) {
- if (errorMessage != null) {
- throw 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;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
throw e;
}
- {
- if (currentSegment != null) {
- currentSegment.add(functionDeclaration);
- currentSegment = functionDeclaration;
- }
- currentFunction = functionDeclaration;
- }
- Block()
- {
- 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();
- }
- }
+ {currentSegment = functionDeclaration;}
+ block = Block()
+ {functionDeclaration.statements = block.statements;
+ currentSegment = seg;
+ return functionDeclaration;}
}
/**
@@ -1018,21 +1020,33 @@ void MethodDeclaration() :
* [&] IDENTIFIER(parameters ...).
* @return a function description for the outline
*/
-PHPFunctionDeclaration MethodDeclarator() :
+MethodDeclaration MethodDeclarator() :
{
final Token identifier;
- final StringBuffer methodDeclaration = new StringBuffer();
+ Token reference = null;
final Hashtable formalParameters;
- final int pos = jj_input_stream.getPosition();
+ final int pos = SimpleCharStream.getPosition();
+ char[] identifierChar = SYNTAX_ERROR_CHAR;
}
{
- [ {methodDeclaration.append("&");} ]
- identifier =
- formalParameters = FormalParameters()
- {
- methodDeclaration.append(identifier);
- return new PHPFunctionDeclaration(currentSegment,methodDeclaration.toString(),pos,formalParameters);
+ [reference = ]
+ try {
+ 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,
+ identifierChar,
+ formalParameters,
+ reference != null,
+ pos,
+ SimpleCharStream.getPosition());}
}
/**
@@ -1041,9 +1055,7 @@ PHPFunctionDeclaration MethodDeclarator() :
*/
Hashtable FormalParameters() :
{
- String expr;
- final StringBuffer buff = new StringBuffer("(");
- PHPVarDeclaration var;
+ VariableDeclaration var;
final Hashtable parameters = new Hashtable();
}
{
@@ -1052,15 +1064,15 @@ Hashtable FormalParameters() :
} catch (ParseException e) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier";
errorLevel = ERROR;
- errorStart = jj_input_stream.getPosition() - e.currentToken.next.image.length() + 1;
- errorEnd = jj_input_stream.getPosition() + 1;
- throw e;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseException(e);
}
[ var = FormalParameter()
- {parameters.put(var.getVariable().getName(),var);}
+ {parameters.put(new String(var.name),var);}
(
var = FormalParameter()
- {parameters.put(var.getVariable().getName(),var);}
+ {parameters.put(new String(var.name),var);}
)*
]
try {
@@ -1068,9 +1080,9 @@ Hashtable FormalParameters() :
} 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;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseException(e);
}
{return parameters;}
}
@@ -1079,405 +1091,371 @@ Hashtable FormalParameters() :
* A formal parameter.
* $varname[=value] (,$varname[=value])
*/
-PHPVarDeclaration FormalParameter() :
+VariableDeclaration FormalParameter() :
{
- final PHPVarDeclaration variableDeclaration;
+ final VariableDeclaration variableDeclaration;
Token token = null;
}
{
[token = ] variableDeclaration = VariableDeclarator()
{
if (token != null) {
- variableDeclaration.getVariable().setReference(true);
+ variableDeclaration.setReference(true);
}
- return variableDeclaration;
- }
+ return variableDeclaration;}
+}
+
+ConstantIdentifier Type() :
+{final int pos;}
+{
+ {pos = SimpleCharStream.getPosition();
+ return new ConstantIdentifier(Types.STRING,pos,pos-6);}
+| {pos = SimpleCharStream.getPosition();
+ return new ConstantIdentifier(Types.BOOL,pos,pos-4);}
+| {pos = SimpleCharStream.getPosition();
+ return new ConstantIdentifier(Types.BOOLEAN,pos,pos-7);}
+| {pos = SimpleCharStream.getPosition();
+ return new ConstantIdentifier(Types.REAL,pos,pos-4);}
+| {pos = SimpleCharStream.getPosition();
+ return new ConstantIdentifier(Types.DOUBLE,pos,pos-5);}
+| {pos = SimpleCharStream.getPosition();
+ return new ConstantIdentifier(Types.FLOAT,pos,pos-5);}
+| {pos = SimpleCharStream.getPosition();
+ return new ConstantIdentifier(Types.INT,pos,pos-3);}
+| {pos = SimpleCharStream.getPosition();
+ return new ConstantIdentifier(Types.INTEGER,pos,pos-7);}
+|