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 823b11e..d45ca07 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -1,3 +1,4 @@
+
options {
LOOKAHEAD = 1;
CHOICE_AMBIGUITY_CHECK = 2;
@@ -17,6 +18,7 @@ options {
BUILD_TOKEN_MANAGER = true;
SANITY_CHECK = true;
FORCE_LA_CHECK = false;
+ COMMON_TOKEN_ACTION = true;
}
PARSER_BEGIN(PHPParser)
@@ -29,7 +31,6 @@ 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.*;
@@ -39,7 +40,9 @@ import net.sourceforge.phpeclipse.actions.PHPStartApacheAction;
import net.sourceforge.phpeclipse.PHPeclipsePlugin;
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;
+import net.sourceforge.phpdt.internal.corext.Assert;
/**
* A new php parser.
@@ -50,8 +53,9 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
*/
public final class PHPParser extends PHPParserSuperclass {
- /** The file that is parsed. */
- private static IFile fileToParse;
+//todo : fix the variables names bug
+//todo : handle tilde operator
+
/** The current segment. */
private static OutlineableWithChildren currentSegment;
@@ -60,9 +64,6 @@ public final class PHPParser extends PHPParserSuperclass {
private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
static PHPOutlineInfo outlineInfo;
- public static MethodDeclaration currentFunction;
- private static boolean assigning;
-
/** 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 */
@@ -71,6 +72,8 @@ public final class PHPParser extends PHPParserSuperclass {
private static int errorStart = -1;
private static int errorEnd = -1;
private static PHPDocument phpDocument;
+
+ private static final String SYNTAX_ERROR_CHAR = "syntax error";
/**
* The point where html starts.
* It will be used by the token manager to create HTMLCode objects
@@ -84,8 +87,10 @@ public final class PHPParser extends PHPParserSuperclass {
/** The cursor in expression stack. */
private static int nodePtr;
+ private static final boolean PARSER_DEBUG = true;
+
public final void setFileToParse(final IFile fileToParse) {
- this.fileToParse = fileToParse;
+ PHPParser.fileToParse = fileToParse;
}
public PHPParser() {
@@ -93,7 +98,47 @@ public final class PHPParser extends PHPParserSuperclass {
public PHPParser(final IFile fileToParse) {
this(new StringReader(""));
- this.fileToParse = fileToParse;
+ PHPParser.fileToParse = fileToParse;
+ }
+
+ public static final void phpParserTester(final String strEval) throws ParseException {
+ final StringReader stream = new StringReader(strEval);
+ if (jj_input_stream == null) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ }
+ ReInit(new StringReader(strEval));
+ init();
+ phpDocument = new PHPDocument(null,"_root".toCharArray());
+ currentSegment = phpDocument;
+ outlineInfo = new PHPOutlineInfo(null, currentSegment);
+ PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING);
+ phpTest();
+ }
+
+ public static final void htmlParserTester(final File fileName) throws FileNotFoundException, ParseException {
+ final Reader stream = new FileReader(fileName);
+ if (jj_input_stream == null) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ }
+ ReInit(stream);
+ init();
+ phpDocument = new PHPDocument(null,"_root".toCharArray());
+ currentSegment = phpDocument;
+ outlineInfo = new PHPOutlineInfo(null, currentSegment);
+ phpFile();
+ }
+
+ public static final void htmlParserTester(final String strEval) throws ParseException {
+ final StringReader stream = new StringReader(strEval);
+ if (jj_input_stream == null) {
+ jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ }
+ ReInit(stream);
+ init();
+ phpDocument = new PHPDocument(null,"_root".toCharArray());
+ currentSegment = phpDocument;
+ outlineInfo = new PHPOutlineInfo(null, currentSegment);
+ phpFile();
}
/**
@@ -109,12 +154,12 @@ public final class PHPParser extends PHPParserSuperclass {
* Add an php node on the stack.
* @param node the node that will be added to the stack
*/
- private static final void pushOnAstNodes(AstNode node) {
+ private static final void pushOnAstNodes(final AstNode node) {
try {
nodes[++nodePtr] = node;
} catch (IndexOutOfBoundsException e) {
- int oldStackLength = nodes.length;
- AstNode[] oldStack = nodes;
+ final int oldStackLength = nodes.length;
+ final AstNode[] oldStack = nodes;
nodes = new AstNode[oldStackLength + AstStackIncrement];
System.arraycopy(oldStack, 0, nodes, 0, oldStackLength);
nodePtr = oldStackLength;
@@ -122,44 +167,10 @@ public final class PHPParser extends PHPParserSuperclass {
}
}
- 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));
- init();
- phpTest();
- }
-
- 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);
- init();
- 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);
- }
- ReInit(stream);
- init();
- phpFile();
- }
-
public final PHPOutlineInfo parseInfo(final Object parent, final String s) {
- currentSegment = new PHPDocument(parent);
- outlineInfo = new PHPOutlineInfo(parent);
+ 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);
@@ -168,13 +179,23 @@ public final class PHPParser extends PHPParserSuperclass {
init();
try {
parse();
- //PHPeclipsePlugin.log(1,phpDocument.toString());
+ 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);
}
return outlineInfo;
}
+ private static void processParseExceptionDebug(final ParseException e) throws ParseException {
+ if (PARSER_DEBUG) {
+ throw e;
+ }
+ processParseException(e);
+ }
/**
* 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
@@ -184,15 +205,16 @@ 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();
- errorEnd = errorStart + 1;
+ errorStart = e.currentToken.sourceStart;
+ errorEnd = e.currentToken.sourceEnd;
}
setMarker(e);
errorMessage = null;
+ // if (PHPeclipsePlugin.DEBUG) PHPeclipsePlugin.log(e);
}
/**
- * Create marker for the parse error
+ * Create marker for the parse error.
* @param e the ParseException
*/
private static void setMarker(final ParseException e) {
@@ -200,8 +222,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(),
+ e.currentToken.sourceStart,
+ e.currentToken.sourceEnd,
errorLevel,
"Line " + e.currentToken.beginLine);
} else {
@@ -219,42 +241,17 @@ 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,
final int brIndx) throws CoreException {
String current;
- StringBuffer lineNumberBuffer = new StringBuffer(10);
+ final StringBuffer lineNumberBuffer = new StringBuffer(10);
char ch;
current = output.substring(indx, brIndx);
if (current.indexOf(PARSE_WARNING_STRING) != -1 || current.indexOf(PARSE_ERROR_STRING) != -1) {
- int onLine = current.indexOf("on line ");
+ final int onLine = current.indexOf("on line ");
if (onLine != -1) {
lineNumberBuffer.delete(0, lineNumberBuffer.length());
for (int i = onLine; i < current.length(); i++) {
@@ -264,9 +261,9 @@ public final class PHPParser extends PHPParserSuperclass {
}
}
- int lineNumber = Integer.parseInt(lineNumberBuffer.toString());
+ final int lineNumber = Integer.parseInt(lineNumberBuffer.toString());
- Hashtable attributes = new Hashtable();
+ final Hashtable attributes = new Hashtable();
current = current.replaceAll("\n", "");
current = current.replaceAll("", "");
@@ -285,7 +282,7 @@ public final class PHPParser extends PHPParserSuperclass {
}
}
- public final void parse(final String s) throws CoreException {
+ public final void parse(final String s) {
final StringReader stream = new StringReader(s);
if (jj_input_stream == null) {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
@@ -325,14 +322,34 @@ 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) {
+ final int currentPosition = token.sourceStart;
+ if (currentPosition == htmlStart ||
+ currentPosition > SimpleCharStream.currentBuffer.length()) {
return;
}
- final char[] chars = SimpleCharStream.currentBuffer.substring(htmlStart,currentPosition).toCharArray();
+ 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 = token.sourceStart;
+ final String todo = SimpleCharStream.currentBuffer.substring(currentPosition-3,
+ SimpleCharStream.currentBuffer.indexOf("\n",
+ currentPosition)-1);
+ if (!PARSER_DEBUG) {
+ try {
+ setMarker(fileToParse,
+ todo,
+ SimpleCharStream.getBeginLine(),
+ TASK,
+ "Line "+SimpleCharStream.getBeginLine());
+ } catch (CoreException e) {
+ PHPeclipsePlugin.log(e);
+ }
+ }
+ }
+
private static final void parse() throws ParseException {
phpFile();
}
@@ -340,6 +357,18 @@ public final class PHPParser extends PHPParserSuperclass {
PARSER_END(PHPParser)
+TOKEN_MGR_DECLS:
+{
+ // CommonTokenAction: use the begins/ends fields added to the Jack
+ // CharStream class to set corresponding fields in each Token (which was
+ // also extended with new fields). By default Jack doesn't supply absolute
+ // offsets, just line/column offsets
+ static void CommonTokenAction(Token t) {
+ t.sourceStart = input_stream.beginOffset;
+ t.sourceEnd = input_stream.endOffset;
+ } // CommonTokenAction
+} // TOKEN_MGR_DECLS
+
TOKEN :
{
{PHPParser.createNewHTMLCode();} : PHPPARSING
@@ -347,9 +376,9 @@ PARSER_END(PHPParser)
| "> {PHPParser.htmlStart = SimpleCharStream.getPosition();} : DEFAULT
+ "> {PHPParser.htmlStart = PHPParser.token.sourceEnd;} : DEFAULT
}
/* Skip any character if we are not in php mode */
@@ -373,34 +402,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
+| < ~[] >
}
- SPECIAL_TOKEN :
+ SPECIAL_TOKEN :
{
- " > : DEFAULT
+ "todo" {PHPParser.createNewTask();}
}
-
-SPECIAL_TOKEN :
+ SPECIAL_TOKEN :
{
- : PHPPARSING
+ "*/" : PHPPARSING
}
-
-SPECIAL_TOKEN :
+ SPECIAL_TOKEN :
{
- : PHPPARSING
+ "*/" : PHPPARSING
}
@@ -433,6 +458,7 @@ MORE :
|
|
|
+|
|
| ">
|
@@ -498,8 +524,8 @@ MORE :
{
|
-|
-|
+|
+|
|
|
|
@@ -518,62 +544,38 @@ MORE :
/* 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"]
@@ -638,7 +640,7 @@ MORE :
TOKEN :
{
- < DOLLAR_ID: >
+ >
}
void phpTest() :
@@ -646,7 +648,6 @@ void phpTest() :
{
Php()
- {PHPParser.createNewHTMLCode();}
}
void phpFile() :
@@ -654,7 +655,7 @@ void phpFile() :
{
try {
(PhpBlock())*
-
+ {PHPParser.createNewHTMLCode();}
} catch (TokenMgrError e) {
PHPeclipsePlugin.log(e);
errorStart = SimpleCharStream.getPosition();
@@ -672,18 +673,20 @@ void phpFile() :
*/
void PhpBlock() :
{
- final int start = jj_input_stream.getPosition();
+ final PHPEchoBlock phpEchoBlock;
+ final Token token;
}
{
- phpEchoBlock()
+ phpEchoBlock = phpEchoBlock()
+ {pushOnAstNodes(phpEchoBlock);}
|
- [
- |
+ [
+ | token =
{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;
+ processParseExceptionDebug(e);
}
}
PHPEchoBlock phpEchoBlock() :
{
final Expression expr;
- final int pos = SimpleCharStream.getPosition();
- PHPEchoBlock echoBlock;
+ final PHPEchoBlock echoBlock;
+ final Token token, token2;
}
{
- expr = Expression() [ ]
+ token = expr = Expression() [ ] token2 =
{
- echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition());
+ echoBlock = new PHPEchoBlock(expr,token.sourceStart,token2.sourceEnd);
pushOnAstNodes(echoBlock);
return echoBlock;}
}
@@ -725,46 +728,58 @@ void Php() :
ClassDeclaration ClassDeclaration() :
{
final ClassDeclaration classDeclaration;
- final Token className;
- Token superclassName = null;
- final int pos;
+ Token className = null;
+ final Token superclassName, token;
+ String classNameImage = SYNTAX_ERROR_CHAR;
+ String superclassNameImage = null;
}
{
-
+ token =
try {
- {pos = jj_input_stream.getPosition();}
className =
+ {classNameImage = className.image;}
} 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;
+ processParseExceptionDebug(e);
}
[
try {
superclassName =
+ {superclassNameImage = superclassName.image;}
} 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;
+ processParseExceptionDebug(e);
+ superclassNameImage = SYNTAX_ERROR_CHAR;
}
]
{
- if (superclassName == null) {
+ int start, end;
+ if (className == null) {
+ start = token.sourceStart;
+ end = token.sourceEnd;
+ } else {
+ start = className.sourceStart;
+ end = className.sourceEnd;
+ }
+ if (superclassNameImage == null) {
+
classDeclaration = new ClassDeclaration(currentSegment,
- className.image.toCharArray(),
- superclassName.image.toCharArray(),
- pos,
- 0);
+ classNameImage,
+ start,
+ end);
} else {
classDeclaration = new ClassDeclaration(currentSegment,
- className.image.toCharArray(),
- pos,
- 0);
+ classNameImage,
+ superclassNameImage,
+ start,
+ end);
}
currentSegment.add(classDeclaration);
currentSegment = classDeclaration;
@@ -776,85 +791,142 @@ ClassDeclaration ClassDeclaration() :
return classDeclaration;}
}
-void ClassBody(ClassDeclaration classDeclaration) :
+void ClassBody(final ClassDeclaration classDeclaration) :
{}
{
try {
} catch (ParseException e) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image + "', '{' 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;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
}
( ClassBodyDeclaration(classDeclaration) )*
try {
} catch (ParseException e) {
- errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '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;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
}
}
/**
* A class can contain only methods and fields.
*/
-void ClassBodyDeclaration(ClassDeclaration classDeclaration) :
+void ClassBodyDeclaration(final ClassDeclaration classDeclaration) :
{
- MethodDeclaration method;
- FieldDeclaration field;
+ final MethodDeclaration method;
+ final FieldDeclaration field;
}
{
- method = MethodDeclaration() {classDeclaration.addMethod(method);}
-| field = FieldDeclaration() {classDeclaration.addVariable(field);}
+ method = MethodDeclaration() {method.analyzeCode();
+ classDeclaration.addMethod(method);}
+| field = FieldDeclaration() {classDeclaration.addField(field);}
}
/**
* A class field declaration : it's var VariableDeclarator() (, VariableDeclarator())*;.
+ * it is only used by ClassBodyDeclaration()
*/
FieldDeclaration FieldDeclaration() :
{
VariableDeclaration variableDeclaration;
+ final VariableDeclaration[] list;
+ final ArrayList arrayList = new ArrayList();
+ final Token token;
+ Token token2 = null;
}
{
- variableDeclaration = VariableDeclarator()
- {
- outlineInfo.addVariable(new String(variableDeclaration.name));
- if (currentSegment != null) {
- currentSegment.add(variableDeclaration);
- }
- }
- (
- variableDeclaration = VariableDeclarator()
- {
- if (currentSegment != null) {
- currentSegment.add(variableDeclaration);
- }
- }
+ token = variableDeclaration = VariableDeclaratorNoSuffix()
+ {arrayList.add(variableDeclaration);
+ outlineInfo.addVariable(variableDeclaration.name());}
+ (
+ variableDeclaration = VariableDeclaratorNoSuffix()
+ {arrayList.add(variableDeclaration);
+ outlineInfo.addVariable(variableDeclaration.name());}
)*
try {
-
+ token2 =
} 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;
+ processParseExceptionDebug(e);
}
+
+ {list = new VariableDeclaration[arrayList.size()];
+ arrayList.toArray(list);
+ int end;
+ if (token2 == null) {
+ end = list[list.length-1].sourceEnd;
+ } else {
+ end = token2.sourceEnd;
+ }
+ return new FieldDeclaration(list,
+ token.sourceStart,
+ end,
+ currentSegment);}
}
+/**
+ * a strict variable declarator : there cannot be a suffix here.
+ * It will be used by fields and formal parameters
+ */
+VariableDeclaration VariableDeclaratorNoSuffix() :
+{
+ final Token varName;
+ Expression initializer = null;
+ Token assignToken;
+}
+{
+ varName =
+ [
+ assignToken =
+ try {
+ initializer = VariableInitializer()
+ } catch (ParseException e) {
+ errorMessage = "Literal expression expected in variable initializer";
+ errorLevel = ERROR;
+ errorStart = assignToken.sourceEnd +1;
+ errorEnd = assignToken.sourceEnd +1;
+ processParseExceptionDebug(e);
+ }
+ ]
+ {
+ if (initializer == null) {
+ return new VariableDeclaration(currentSegment,
+ new Variable(varName.image.substring(1),
+ varName.sourceStart+1,
+ varName.sourceEnd+1),
+ varName.sourceStart+1,
+ varName.sourceEnd+1);
+ }
+ return new VariableDeclaration(currentSegment,
+ new Variable(varName.image.substring(1),
+ varName.sourceStart+1,
+ varName.sourceEnd+1),
+ initializer,
+ VariableDeclaration.EQUAL,
+ varName.sourceStart+1);
+ }
+}
+
+/**
+ * this will be used by static statement
+ */
VariableDeclaration VariableDeclarator() :
{
- final String varName, varValue;
+ final AbstractVariable variable;
Expression initializer = null;
- final int pos = jj_input_stream.getPosition();
}
{
- varName = VariableDeclaratorId()
+ variable = VariableDeclaratorId()
[
try {
@@ -862,148 +934,240 @@ VariableDeclaration VariableDeclarator() :
} 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;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ processParseExceptionDebug(e);
}
]
- {return new VariableDeclaration(currentSegment,
- varName.toCharArray(),
- initializer,
- pos);}
+ {
+ if (initializer == null) {
+ return new VariableDeclaration(currentSegment,
+ variable,
+ variable.sourceStart,
+ variable.sourceEnd);
+ }
+ return new VariableDeclaration(currentSegment,
+ variable,
+ initializer,
+ VariableDeclaration.EQUAL,
+ variable.sourceStart);
+ }
}
/**
* A Variable name.
* @return the variable name (with suffix)
*/
-String VariableDeclaratorId() :
+AbstractVariable VariableDeclaratorId() :
{
- String expr;
- Expression expression;
- final StringBuffer buff = new StringBuffer();
- final int pos = SimpleCharStream.getPosition();
- ConstantIdentifier ex;
+ final Variable var;
+ AbstractVariable expression = null;
}
{
try {
- expr = Variable() {buff.append(expr);}
- ( LOOKAHEAD(2)
- {ex = new ConstantIdentifier(expr.toCharArray(),
- pos,
- SimpleCharStream.getPosition());}
- expression = VariableSuffix(ex)
- {buff.append(expression.toStringExpression());}
+ var = Variable()
+ (
+ LOOKAHEAD(2)
+ expression = VariableSuffix(var)
)*
- {return buff.toString();}
+ {
+ if (expression == null) {
+ return var;
+ }
+ return expression;
+ }
} 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;
}
}
-String Variable():
+/**
+ * Return a variablename without the $.
+ * @return a variable name
+ *//*
+Variable Variable():
{
final StringBuffer buff;
Expression expression = null;
final Token token;
- final String expr;
+ Variable expr;
+ final int pos;
}
{
- token = [ expression = Expression() ]
+ token =
+ [ expression = Expression() ]
{
- if (expression == null && !assigning) {
- return token.image.substring(1);
+ if (expression == null) {
+ return new Variable(token.image.substring(1),
+ token.sourceStart+1,
+ token.sourceEnd+1);
}
- buff = new StringBuffer(token.image);
- buff.append('{');
- buff.append(expression.toStringExpression());
- buff.append('}');
- return buff.toString();
+ String s = expression.toStringExpression();
+ buff = new StringBuffer(token.image.length()+s.length()+2);
+ buff.append(token.image);
+ buff.append("{");
+ buff.append(s);
+ buff.append("}");
+ s = buff.toString();
+ return new Variable(s,token.sourceStart+1,token.sourceEnd+1);
}
|
- expr = VariableName()
- {return expr;}
+ token =
+ expr = VariableName()
+ {return new Variable(expr,token.sourceStart,expr.sourceEnd);}
+} */
+
+Variable Variable() :
+{
+ Variable variable = null;
+ final Token token;
+}
+{
+ token = [variable = Var(token)]
+ {
+ if (variable == null) {
+ return new Variable(token.image.substring(1),token.sourceStart+1,token.sourceEnd+1);
+ }
+ final StringBuffer buff = new StringBuffer();
+ buff.append(token.image.substring(1));
+ buff.append(variable.toStringExpression());
+ return new Variable(buff.toString(),token.sourceStart+1,variable.sourceEnd+1);
+ }
+|
+ token = variable = Var(token)
+ {
+ return new Variable(variable,token.sourceStart,variable.sourceEnd);
+ }
+}
+
+Variable Var(final Token dollar) :
+{
+ Variable variable = null;
+ final Token token;
+ ConstantIdentifier constant;
+}
+{
+ token = [variable = Var(token)]
+ {if (variable == null) {
+ return new Variable(token.image.substring(1),token.sourceStart+1,token.sourceEnd+1);
+ }
+ final StringBuffer buff = new StringBuffer();
+ buff.append(token.image.substring(1));
+ buff.append(variable.toStringExpression());
+ return new Variable(buff.toString(),dollar.sourceStart,variable.sourceEnd);
+ }
+|
+ LOOKAHEAD( )
+ token = variable = Var(token)
+ {return new Variable(variable,dollar.sourceStart,variable.sourceEnd);}
+|
+ constant = VariableName()
+ {return new Variable(constant.name,dollar.sourceStart,constant.sourceEnd);}
}
-String VariableName():
+/**
+ * A Variable name (without the $)
+ * @return a variable name String
+ */
+ConstantIdentifier VariableName():
{
final StringBuffer buff;
- String expr = null;
+ String expr;
Expression expression = null;
final Token token;
+ Token token2 = null;
}
{
- expression = Expression()
- {buff = new StringBuffer('{');
- buff.append(expression.toStringExpression());
- buff.append('}');
- return buff.toString();}
+ token = expression = Expression() token2 =
+ {expr = expression.toStringExpression();
+ buff = new StringBuffer(expr.length()+2);
+ buff.append("{");
+ buff.append(expr);
+ buff.append("}");
+ expr = buff.toString();
+ return new ConstantIdentifier(expr,
+ token.sourceStart,
+ token2.sourceEnd);
+
+ }
|
- token = [ expression = Expression() ]
+ token =
+ [ expression = Expression() token2 = ]
{
if (expression == null) {
- return token.image;
+ return new ConstantIdentifier(token.image,
+ token.sourceStart,
+ token.sourceEnd);
}
- buff = new StringBuffer(token.image);
- buff.append('{');
- buff.append(expression.toStringExpression());
- buff.append('}');
- return buff.toString();
- }
-|
- expr = VariableName()
- {
- buff = new StringBuffer('$');
+ expr = expression.toStringExpression();
+ buff = new StringBuffer(token.image.length()+expr.length()+2);
+ buff.append(token.image);
+ buff.append("{");
buff.append(expr);
- return buff.toString();
+ buff.append("}");
+ expr = buff.toString();
+ return new ConstantIdentifier(expr,
+ token.sourceStart,
+ token2.sourceEnd);
+ }
+/*|
+
+ var = VariableName()
+ {
+ return new Variable(var,
+ var.sourceStart-1,
+ var.sourceEnd);
}
|
- token = {return token.image;}
+ token =
+ {
+ return new Variable(token.image,
+ token.sourceStart+1,
+ token.sourceEnd+1);
+ } */
}
Expression VariableInitializer() :
{
final Expression expr;
- final Token token;
- final int pos = SimpleCharStream.getPosition();
+ final Token token, token2;
}
{
expr = Literal()
{return expr;}
|
- (token = | token = )
- {return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition()),
+ token2 = (token = | token = )
+ {return new PrefixedUnaryExpression(new NumberLiteral(token),
OperatorIds.MINUS,
- pos);}
+ token2.sourceStart);}
|
- (token = | token = )
- {return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(),
- pos,
- SimpleCharStream.getPosition()),
+ token2 = (token = | token = )
+ {return new PrefixedUnaryExpression(new NumberLiteral(token),
OperatorIds.PLUS,
- pos);}
+ token2.sourceStart);}
|
expr = ArrayDeclarator()
{return expr;}
|
token =
- {return new ConstantIdentifier(token.image.toCharArray(),pos,SimpleCharStream.getPosition());}
+ {return new ConstantIdentifier(token);}
}
ArrayVariableDeclaration ArrayVariable() :
{
-Expression expr;
-Expression expr2 = null;
+final Expression expr,expr2;
}
{
- expr = Expression() [ expr2 = Expression()]
- {return new ArrayVariableDeclaration(expr,expr2);}
+ expr = Expression()
+ [
+ expr2 = Expression()
+ {return new ArrayVariableDeclaration(expr,expr2);}
+ ]
+ {return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());}
}
ArrayVariableDeclaration[] ArrayInitializer() :
@@ -1012,15 +1176,22 @@ ArrayVariableDeclaration[] ArrayInitializer() :
final ArrayList list = new ArrayList();
}
{
- [ expr = ArrayVariable()
- {list.add(expr);}
- ( LOOKAHEAD(2) expr = ArrayVariable()
- {list.add(expr);}
- )*
- ]
- [ {list.add(null);}]
+
+ [
+ expr = ArrayVariable()
+ {list.add(expr);}
+ ( LOOKAHEAD(2) expr = ArrayVariable()
+ {list.add(expr);}
+ )*
+ ]
+ [
+ {list.add(null);}
+ ]
- {return (ArrayVariableDeclaration[]) list.toArray();}
+ {
+ final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()];
+ list.toArray(vars);
+ return vars;}
}
/**
@@ -1030,40 +1201,28 @@ ArrayVariableDeclaration[] ArrayInitializer() :
MethodDeclaration MethodDeclaration() :
{
final MethodDeclaration functionDeclaration;
- Token functionToken;
final Block block;
+ final OutlineableWithChildren seg = currentSegment;
+ final Token token;
}
{
- functionToken =
+ token =
try {
- functionDeclaration = MethodDeclarator()
+ functionDeclaration = MethodDeclarator(token.sourceStart)
{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;
- }
+ {currentSegment = functionDeclaration;}
block = Block()
- {
- functionDeclaration.statements = block.statements;
- currentFunction = null;
- if (currentSegment != null) {
- currentSegment = (OutlineableWithChildren) currentSegment.getParent();
- }
- return functionDeclaration;
- }
+ {functionDeclaration.statements = block.statements;
+ currentSegment = seg;
+ return functionDeclaration;}
}
/**
@@ -1071,35 +1230,61 @@ MethodDeclaration MethodDeclaration() :
* [&] IDENTIFIER(parameters ...).
* @return a function description for the outline
*/
-MethodDeclaration MethodDeclarator() :
+MethodDeclaration MethodDeclarator(final int start) :
{
- final Token identifier;
+ Token identifier = null;
Token reference = null;
- final Hashtable formalParameters;
- final int pos = SimpleCharStream.getPosition();
+ final Hashtable formalParameters = new Hashtable();
+ String identifierChar = SYNTAX_ERROR_CHAR;
+ final int end;
}
{
- [ reference = ]
- identifier =
- formalParameters = FormalParameters()
- {return new MethodDeclaration(currentSegment,
- identifier.image.toCharArray(),
- formalParameters,
- reference != null,
- pos,
- SimpleCharStream.getPosition());}
+ [reference = ]
+ try {
+ identifier =
+ {identifierChar = identifier.image;}
+ } 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;
+ processParseExceptionDebug(e);
+ }
+ end = FormalParameters(formalParameters)
+ {
+ int nameStart, nameEnd;
+ if (identifier == null) {
+ if (reference == null) {
+ nameStart = start + 9;
+ nameEnd = start + 10;
+ } else {
+ nameStart = reference.sourceEnd + 1;
+ nameEnd = reference.sourceEnd + 2;
+ }
+ } else {
+ nameStart = identifier.sourceStart;
+ nameEnd = identifier.sourceEnd;
+ }
+ return new MethodDeclaration(currentSegment,
+ identifierChar,
+ formalParameters,
+ reference != null,
+ nameStart,
+ nameEnd,
+ start,
+ end);
+ }
}
/**
* FormalParameters follows method identifier.
* (FormalParameter())
*/
-Hashtable FormalParameters() :
+int FormalParameters(final Hashtable parameters) :
{
- String expr;
- final StringBuffer buff = new StringBuffer("(");
VariableDeclaration var;
- final Hashtable parameters = new Hashtable();
+ final Token token;
+ int end;
}
{
try {
@@ -1107,27 +1292,30 @@ 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;
+ processParseExceptionDebug(e);
}
- [ var = FormalParameter()
- {parameters.put(new String(var.name),var);}
- (
- var = FormalParameter()
- {parameters.put(new String(var.name),var);}
- )*
- ]
+ [
+ var = FormalParameter()
+ {parameters.put(new String(var.name()),var);}
+ (
+ var = FormalParameter()
+ {parameters.put(new String(var.name()),var);}
+ )*
+ ]
try {
-
+ token =
+ {end = token.sourceEnd;}
} 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;
+ processParseExceptionDebug(e);
+ end = e.currentToken.sourceStart;
}
- {return parameters;}
+ {return end;}
}
/**
@@ -1140,7 +1328,7 @@ VariableDeclaration FormalParameter() :
Token token = null;
}
{
- [token = ] variableDeclaration = VariableDeclarator()
+ [token = ] variableDeclaration = VariableDeclaratorNoSuffix()
{
if (token != null) {
variableDeclaration.setReference(true);
@@ -1149,98 +1337,105 @@ VariableDeclaration FormalParameter() :
}
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);}
-|