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 d45ca07..e8ab5f2 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -87,7 +87,7 @@ public final class PHPParser extends PHPParserSuperclass {
   /** The cursor in expression stack. */
   private static int nodePtr;
 
-  private static final boolean PARSER_DEBUG = true;
+  public static final boolean PARSER_DEBUG = false;
 
   public final void setFileToParse(final IFile fileToParse) {
     PHPParser.fileToParse = fileToParse;
@@ -190,6 +190,13 @@ public final class PHPParser extends PHPParserSuperclass {
     return outlineInfo;
   }
 
+  /**
+   * This function will throw the exception if we are in debug mode
+   * and process it if we are in production mode.
+   * this should be fast since the PARSER_DEBUG is static final so the difference will be at compile time
+   * @param e the exception
+   * @throws ParseException the thrown exception
+   */
   private static void processParseExceptionDebug(final ParseException e) throws ParseException {
     if (PARSER_DEBUG) {
       throw e;
@@ -225,14 +232,14 @@ public final class PHPParser extends PHPParserSuperclass {
                   e.currentToken.sourceStart,
                   e.currentToken.sourceEnd,
                   errorLevel,
-                  "Line " + e.currentToken.beginLine);
+                  "Line " + e.currentToken.beginLine+", "+e.currentToken.sourceStart+":"+e.currentToken.sourceEnd);
       } else {
         setMarker(fileToParse,
                   errorMessage,
                   errorStart,
                   errorEnd,
                   errorLevel,
-                  "Line " + e.currentToken.beginLine);
+                  "Line " + e.currentToken.beginLine+", "+errorStart+":"+errorEnd);
         errorStart = -1;
         errorEnd = -1;
       }
@@ -658,8 +665,8 @@ void phpFile() :
     {PHPParser.createNewHTMLCode();}
   } catch (TokenMgrError e) {
     PHPeclipsePlugin.log(e);
-    errorStart   = SimpleCharStream.getPosition();
-    errorEnd     = errorStart + 1;
+    errorStart   = SimpleCharStream.beginOffset;
+    errorEnd     = SimpleCharStream.endOffset;
     errorMessage = e.getMessage();
     errorLevel   = ERROR;
     throw generateParseException();
@@ -729,7 +736,7 @@ ClassDeclaration ClassDeclaration() :
 {
   final ClassDeclaration classDeclaration;
   Token className = null;
-  final Token superclassName, token;
+  final Token superclassName, token, extendsToken;
   String classNameImage = SYNTAX_ERROR_CHAR;
   String superclassNameImage = null;
 }
@@ -741,20 +748,20 @@ ClassDeclaration ClassDeclaration() :
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
     errorLevel   = ERROR;
-    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = SimpleCharStream.getPosition() + 1;
+    errorStart   = token.sourceEnd+1;
+    errorEnd     = token.sourceEnd+1;
     processParseExceptionDebug(e);
   }
   [
-    <EXTENDS>
+    extendsToken = <EXTENDS>
     try {
       superclassName = <IDENTIFIER>
       {superclassNameImage = superclassName.image;}
     } catch (ParseException e) {
       errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected";
       errorLevel   = ERROR;
-      errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd   = SimpleCharStream.getPosition() + 1;
+      errorStart = extendsToken.sourceEnd+1;
+      errorEnd   = extendsToken.sourceEnd+1;
       processParseExceptionDebug(e);
       superclassNameImage = SYNTAX_ERROR_CHAR;
     }
@@ -840,23 +847,30 @@ FieldDeclaration FieldDeclaration() :
   final ArrayList arrayList = new ArrayList();
   final Token token;
   Token token2 = null;
+  int pos;
 }
 {
   token = <VAR> variableDeclaration = VariableDeclaratorNoSuffix()
-  {arrayList.add(variableDeclaration);
-   outlineInfo.addVariable(variableDeclaration.name());}
+  {
+    arrayList.add(variableDeclaration);
+    outlineInfo.addVariable(variableDeclaration.name());
+    pos = variableDeclaration.sourceEnd;
+  }
   (
     <COMMA> variableDeclaration = VariableDeclaratorNoSuffix()
-      {arrayList.add(variableDeclaration);
-       outlineInfo.addVariable(variableDeclaration.name());}
+      {
+        arrayList.add(variableDeclaration);
+        outlineInfo.addVariable(variableDeclaration.name());
+        pos = variableDeclaration.sourceEnd;
+      }
   )*
   try {
     token2 = <SEMICOLON>
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration";
     errorLevel   = ERROR;
-    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = SimpleCharStream.getPosition() + 1;
+    errorStart   = pos+1;
+    errorEnd     = pos+1;
     processParseExceptionDebug(e);
   }
 
@@ -924,18 +938,19 @@ VariableDeclaration VariableDeclarator() :
 {
   final AbstractVariable variable;
   Expression initializer = null;
+  final Token token;
 }
 {
   variable = VariableDeclaratorId()
   [
-    <ASSIGN>
+    token = <ASSIGN>
     try {
       initializer = VariableInitializer()
     } catch (ParseException e) {
       errorMessage = "Literal expression expected in variable initializer";
       errorLevel   = ERROR;
-      errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd   = SimpleCharStream.getPosition() + 1;
+      errorStart = token.sourceEnd+1;
+      errorEnd   = token.sourceEnd+1;
       processParseExceptionDebug(e);
     }
   ]
@@ -1209,7 +1224,7 @@ MethodDeclaration MethodDeclaration() :
   token = <FUNCTION>
   try {
     functionDeclaration = MethodDeclarator(token.sourceStart)
-    {outlineInfo.addVariable(new String(functionDeclaration.name));}
+    {outlineInfo.addVariable(functionDeclaration.name);}
   } catch (ParseException e) {
     if (errorMessage != null)  throw e;
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected";
@@ -1236,18 +1251,21 @@ MethodDeclaration MethodDeclarator(final int start) :
   Token reference = null;
   final Hashtable formalParameters = new Hashtable();
   String identifierChar = SYNTAX_ERROR_CHAR;
-  final int end;
+  int end = start;
 }
 {
-  [reference = <BIT_AND>]
+  [reference = <BIT_AND> {end = reference.sourceEnd;}]
   try {
     identifier = <IDENTIFIER>
-    {identifierChar = identifier.image;}
+    {
+      identifierChar = identifier.image;
+      end = identifier.sourceEnd;
+    }
   } 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;
+    errorStart = e.currentToken.sourceEnd;
+    errorEnd   = e.currentToken.next.sourceStart;
     processParseExceptionDebug(e);
   }
   end = FormalParameters(formalParameters)
@@ -1284,24 +1302,26 @@ int FormalParameters(final Hashtable parameters) :
 {
   VariableDeclaration var;
   final Token token;
-  int end;
+  Token tok = PHPParser.token;
+  int end = tok.sourceEnd;
 }
 {
   try {
-  <LPAREN>
+  tok = <LPAREN>
+  {end = tok.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
+    errorStart = e.currentToken.next.sourceStart;
+    errorEnd   = e.currentToken.next.sourceEnd;
     processParseExceptionDebug(e);
   }
   [
     var = FormalParameter()
-    {parameters.put(new String(var.name()),var);}
+    {parameters.put(var.name(),var);end = var.sourceEnd;}
     (
       <COMMA> var = FormalParameter()
-      {parameters.put(new String(var.name()),var);}
+      {parameters.put(var.name(),var);end = var.sourceEnd;}
     )*
   ]
   try {
@@ -1310,10 +1330,9 @@ int FormalParameters(final Hashtable parameters) :
   } catch (ParseException e) {
     errorMessage = "')' expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
+    errorStart = e.currentToken.next.sourceStart;
+    errorEnd   = e.currentToken.next.sourceEnd;
     processParseExceptionDebug(e);
-    end = e.currentToken.sourceStart;
   }
  {return end;}
 }
@@ -1545,15 +1564,16 @@ Expression EqualityExpression() :
 {
   Expression expr,expr2;
   int operator;
+  Token token;
 }
 {
   expr = RelationalExpression()
   (
-  (   <EQUAL_EQUAL>      {operator = OperatorIds.EQUAL_EQUAL;}
-    | <DIF>              {operator = OperatorIds.DIF;}
-    | <NOT_EQUAL>        {operator = OperatorIds.DIF;}
-    | <BANGDOUBLEEQUAL>  {operator = OperatorIds.BANG_EQUAL_EQUAL;}
-    | <TRIPLEEQUAL>      {operator = OperatorIds.EQUAL_EQUAL_EQUAL;}
+  (   token = <EQUAL_EQUAL>      {operator = OperatorIds.EQUAL_EQUAL;}
+    | token = <DIF>              {operator = OperatorIds.DIF;}
+    | token = <NOT_EQUAL>        {operator = OperatorIds.DIF;}
+    | token = <BANGDOUBLEEQUAL>  {operator = OperatorIds.BANG_EQUAL_EQUAL;}
+    | token = <TRIPLEEQUAL>      {operator = OperatorIds.EQUAL_EQUAL_EQUAL;}
   )
   try {
     expr2 = RelationalExpression()
@@ -1563,9 +1583,10 @@ Expression EqualityExpression() :
     }
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = token.sourceEnd +1;
+    errorEnd   = token.sourceEnd +1;
+    expr2 = new ConstantIdentifier(SYNTAX_ERROR_CHAR,token.sourceEnd +1,token.sourceEnd +1);
+    processParseExceptionDebug(e);
   }
   {
     expr = new BinaryExpression(expr,expr2,operator);
@@ -1639,8 +1660,8 @@ Expression MultiplicativeExpression() :
     if (errorMessage != null) throw e;
     errorMessage = "unexpected token '"+e.currentToken.next.image+"'";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
+    errorStart = PHPParser.token.sourceStart;
+    errorEnd   = PHPParser.token.sourceEnd;
     throw e;
   }
   (
@@ -1742,9 +1763,9 @@ Expression UnaryExpressionNotPlusMinus() :
   } catch (ParseException e) {
     errorMessage = "')' expected";
     errorLevel   = ERROR;
-    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart   = expr.sourceEnd +1;
+    errorEnd     = expr.sourceEnd +1;
+    processParseExceptionDebug(e);
   }
   {return expr;}
 }
@@ -1866,7 +1887,9 @@ ArrayInitializer ArrayDeclarator() :
 }
 {
   token = <ARRAY> vars = ArrayInitializer()
-  {return new ArrayInitializer(vars,token.sourceStart,SimpleCharStream.getPosition());}
+  {return new ArrayInitializer(vars,
+                               token.sourceStart,
+                               PHPParser.token.sourceEnd);}
 }
 
 Expression ClassIdentifier():
@@ -1887,6 +1910,8 @@ AbstractVariable VariableSuffix(final AbstractVariable prefix) :
 {
   Expression expression = null;
   final Token classAccessToken;
+  Token token;
+  int pos;
 }
 {
   classAccessToken = <CLASSACCESS>
@@ -1903,17 +1928,20 @@ AbstractVariable VariableSuffix(final AbstractVariable prefix) :
                           expression,
                           ClassAccess.NORMAL);}
 |
-  <LBRACKET> [ expression = Expression() | expression = Type() ]  //Not good
+  token = <LBRACKET> {pos = token.sourceEnd+1;}
+  [  expression = Expression() {pos = expression.sourceEnd+1;}
+   | expression = Type()       {pos = expression.sourceEnd+1;}]  //Not good
   try {
-    <RBRACKET>
+    token = <RBRACKET>
+    {pos = token.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "']' expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
-  {return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());}
+  {return new ArrayDeclarator(prefix,expression,pos);}
 }
 
 Literal Literal() :
@@ -1938,14 +1966,15 @@ final Token token;
   <LPAREN> [ args = ArgumentList() ]
   try {
     token = <RPAREN>
+    {return new FunctionCall(func,args,token.sourceEnd);}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = args[args.length-1].sourceEnd+1;
+    errorEnd   = args[args.length-1].sourceEnd+1;
+    processParseExceptionDebug(e);
   }
-  {return new FunctionCall(func,args,token.sourceEnd);}
+  {return new FunctionCall(func,args,args[args.length-1].sourceEnd);}
 }
 
 /**
@@ -1957,20 +1986,23 @@ Expression[] ArgumentList() :
 {
 Expression arg;
 final ArrayList list = new ArrayList();
+int pos;
+Token token;
 }
 {
   arg = Expression()
-  {list.add(arg);}
-  ( <COMMA>
+  {list.add(arg);pos = arg.sourceEnd;}
+  ( token = <COMMA> {pos = token.sourceEnd;}
       try {
         arg = Expression()
-        {list.add(arg);}
+        {list.add(arg);
+         pos = arg.sourceEnd;}
       } catch (ParseException e) {
         errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. An expression expected after a comma in argument list";
         errorLevel   = ERROR;
-        errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-        errorEnd     = SimpleCharStream.getPosition() + 1;
-        throw e;
+        errorStart   = pos+1;
+        errorEnd     = pos+1;
+        processParseException(e);
       }
    )*
    {
@@ -2034,9 +2066,9 @@ Statement expressionStatement() :
     if (e.currentToken.next.kind != PHPParserConstants.PHPEND) {
       errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
       errorLevel   = ERROR;
-      errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd   = SimpleCharStream.getPosition() + 1;
-      throw e;
+      errorStart = statement.sourceEnd+1;
+      errorEnd   = statement.sourceEnd+1;
+      processParseExceptionDebug(e);
     }
   }
   {return statement;}
@@ -2044,61 +2076,70 @@ Statement expressionStatement() :
 
 Define defineStatement() :
 {
-  final int start = SimpleCharStream.getPosition();
   Expression defineName,defineValue;
+  final Token defineToken;
+  Token token;
+  int pos;
 }
 {
-  <DEFINE>
+  defineToken = <DEFINE> {pos = defineToken.sourceEnd+1;}
   try {
-    <LPAREN>
+    token = <LPAREN>
+    {pos = token.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected";
     errorLevel   = ERROR;
-    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = SimpleCharStream.getPosition() + 1;
+    errorStart   = pos;
+    errorEnd     = pos;
     processParseExceptionDebug(e);
   }
   try {
     defineName = Expression()
+    {pos = defineName.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
     errorLevel   = ERROR;
-    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart   = pos;
+    errorEnd     = pos;
+    processParseExceptionDebug(e);
+    defineName = new StringLiteral(SYNTAX_ERROR_CHAR,pos,pos);
   }
   try {
-    <COMMA>
+    token = <COMMA>
+    {pos = defineName.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected";
     errorLevel   = ERROR;
-    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = SimpleCharStream.getPosition() + 1;
+    errorStart   = pos;
+    errorEnd     = pos;
     processParseExceptionDebug(e);
   }
   try {
     defineValue = Expression()
+    {pos = defineValue.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected";
     errorLevel   = ERROR;
-    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart   = pos;
+    errorEnd     = pos;
+    processParseExceptionDebug(e);
+    defineValue = new StringLiteral(SYNTAX_ERROR_CHAR,pos,pos);
   }
   try {
-    <RPAREN>
+    token = <RPAREN>
+    {pos = token.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected";
     errorLevel   = ERROR;
-    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = SimpleCharStream.getPosition() + 1;
+    errorStart   = pos;
+    errorEnd     = pos;
     processParseExceptionDebug(e);
   }
   {return new Define(currentSegment,
                      defineName,
                      defineValue,
-                     start,
-                     SimpleCharStream.getPosition());}
+                     defineToken.sourceStart,
+                     pos);}
 }
 
 /**
@@ -2146,27 +2187,30 @@ HTMLBlock htmlBlock() :
  */
 InclusionStatement IncludeStatement() :
 {
-  final Expression expr;
+  Expression expr;
   final int keyword;
   final InclusionStatement inclusionStatement;
   final Token token, token2;
+  int pos;
 }
 {
-      (  token = <REQUIRE>      {keyword = InclusionStatement.REQUIRE;}
-       | token = <REQUIRE_ONCE> {keyword = InclusionStatement.REQUIRE_ONCE;}
-       | token = <INCLUDE>      {keyword = InclusionStatement.INCLUDE;}
-       | token = <INCLUDE_ONCE> {keyword = InclusionStatement.INCLUDE_ONCE;})
+      (  token = <REQUIRE>      {keyword = InclusionStatement.REQUIRE;pos=token.sourceEnd;}
+       | token = <REQUIRE_ONCE> {keyword = InclusionStatement.REQUIRE_ONCE;pos=token.sourceEnd;}
+       | token = <INCLUDE>      {keyword = InclusionStatement.INCLUDE;pos=token.sourceEnd;}
+       | token = <INCLUDE_ONCE> {keyword = InclusionStatement.INCLUDE_ONCE;pos=token.sourceEnd;})
   try {
     expr = Expression()
+    {pos=expr.sourceEnd;}
   } catch (ParseException e) {
     if (errorMessage != null) {
       throw e;
     }
     errorMessage = "unexpected token '"+ e.currentToken.next.image+"', expression expected";
     errorLevel   = ERROR;
-    errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd     = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart   = pos+1;
+    errorEnd     = pos+1;
+    expr = new ConstantIdentifier(SYNTAX_ERROR_CHAR,pos,pos);
+    processParseExceptionDebug(e);
   }
   {inclusionStatement = new InclusionStatement(currentSegment,
                                                keyword,
@@ -2190,10 +2234,11 @@ InclusionStatement IncludeStatement() :
 PrintExpression PrintExpression() :
 {
   final Expression expr;
-  final int pos = SimpleCharStream.getPosition();
+  final Token printToken;
 }
 {
-  <PRINT> expr = Expression() {return new PrintExpression(expr,pos,SimpleCharStream.getPosition());}
+  token = <PRINT> expr = Expression()
+  {return new PrintExpression(expr,token.sourceStart,expr.sourceEnd);}
 }
 
 ListExpression ListExpression() :
@@ -2201,13 +2246,14 @@ ListExpression ListExpression() :
   Expression expr = null;
   final Expression expression;
   final ArrayList list = new ArrayList();
-  final int pos = SimpleCharStream.getPosition();
-  final Token listToken;
+  int pos;
+  final Token listToken, rParen;
+  Token token;
 }
 {
-  listToken = <LIST>
+  listToken = <LIST> {pos = listToken.sourceEnd;}
   try {
-    <LPAREN>
+    token = <LPAREN> {pos = token.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected";
     errorLevel   = ERROR;
@@ -2217,29 +2263,31 @@ ListExpression ListExpression() :
   }
   [
     expr = VariableDeclaratorId()
-    {list.add(expr);}
+    {list.add(expr);pos = expr.sourceEnd;}
   ]
   {if (expr == null) list.add(null);}
   (
     try {
-      <COMMA>
+      token = <COMMA>
+      {pos = token.sourceEnd;}
     } catch (ParseException e) {
       errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected";
       errorLevel   = ERROR;
-      errorStart   = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-      errorEnd     = SimpleCharStream.getPosition() + 1;
-      throw e;
+      errorStart   = pos+1;
+      errorEnd     = pos+1;
+      processParseExceptionDebug(e);
     }
-    [expr = VariableDeclaratorId() {list.add(expr);}]
+    [expr = VariableDeclaratorId() {list.add(expr);pos = expr.sourceEnd;}]
   )*
   try {
-    <RPAREN>
+    rParen = <RPAREN>
+    {pos = rParen.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos+1;
+    errorEnd   = pos+1;
+      processParseExceptionDebug(e);
   }
   [ <ASSIGN> expression = Expression()
     {
@@ -2247,13 +2295,13 @@ ListExpression ListExpression() :
     list.toArray(vars);
     return new ListExpression(vars,
                               expression,
-                              pos,
-                              SimpleCharStream.getPosition());}
+                              listToken.sourceStart,
+                              expression.sourceEnd);}
   ]
   {
-    final Variable[] vars = new Variable[list.size()];
+    final AbstractVariable[] vars = new AbstractVariable[list.size()];
     list.toArray(vars);
-    return new ListExpression(vars,pos,SimpleCharStream.getPosition());}
+    return new ListExpression(vars,listToken.sourceStart,pos);}
 }
 
 /**
@@ -2301,33 +2349,35 @@ GlobalStatement GlobalStatement() :
    final ArrayList vars = new ArrayList();
    final GlobalStatement global;
    final Token token, token2;
+   int pos;
 }
 {
   token = <GLOBAL>
     expr = Variable()
-    {vars.add(expr);}
+    {vars.add(expr);pos = expr.sourceEnd+1;}
   (<COMMA>
     expr = Variable()
-    {vars.add(expr);}
+    {vars.add(expr);pos = expr.sourceEnd+1;}
   )*
   try {
     token2 = <SEMICOLON>
+    {pos = token2.sourceEnd+1;}
+  } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected";
+    errorLevel   = ERROR;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
+  }
     {
     final Variable[] variables = new Variable[vars.size()];
     vars.toArray(variables);
     global = new GlobalStatement(currentSegment,
                                  variables,
                                  token.sourceStart,
-                                 token2.sourceEnd);
+                                 pos);
     currentSegment.add(global);
     return global;}
-  } catch (ParseException e) {
-    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected";
-    errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
-  }
 }
 
 StaticStatement StaticStatement() :
@@ -2335,27 +2385,29 @@ StaticStatement StaticStatement() :
   final ArrayList vars = new ArrayList();
   VariableDeclaration expr;
   final Token token, token2;
+  int pos;
 }
 {
-  token = <STATIC> expr = VariableDeclarator() {vars.add(expr);}
+  token = <STATIC> expr = VariableDeclarator() {vars.add(expr);pos = expr.sourceEnd+1;}
   (
-    <COMMA> expr = VariableDeclarator() {vars.add(expr);}
+    <COMMA> expr = VariableDeclarator() {vars.add(expr);pos = expr.sourceEnd+1;}
   )*
   try {
     token2 = <SEMICOLON>
+    {pos = token2.sourceEnd+1;}
+  } catch (ParseException e) {
+    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected";
+    errorLevel   = ERROR;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseException(e);
+  }
     {
     final VariableDeclaration[] variables = new VariableDeclaration[vars.size()];
     vars.toArray(variables);
     return new StaticStatement(variables,
                                token.sourceStart,
-                               token2.sourceEnd);}
-  } catch (ParseException e) {
-    errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected";
-    errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
-  }
+                               pos);}
 }
 
 LabeledStatement LabeledStatement() :
@@ -2380,32 +2432,37 @@ Block Block() :
   final ArrayList list = new ArrayList();
   Statement statement;
   final Token token, token2;
+  int pos,start;
 }
 {
   try {
     token = <LBRACE>
+    {pos = token.sourceEnd+1;start=token.sourceStart;}
   } catch (ParseException e) {
     errorMessage = "'{' expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    pos = PHPParser.token.sourceEnd+1;
+    start=pos;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
-  ( statement = BlockStatement() {list.add(statement);}
-  | statement = htmlBlock()      {list.add(statement);})*
+  ( statement = BlockStatement() {list.add(statement);pos = statement.sourceEnd+1;}
+  | statement = htmlBlock()      {list.add(statement);pos = statement.sourceEnd+1;})*
   try {
     token2 = <RBRACE>
+    {pos = token2.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.image +"', '}' expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
   {
   final Statement[] statements = new Statement[list.size()];
   list.toArray(statements);
-  return new Block(statements,token.sourceStart,token2.sourceEnd);}
+  return new Block(statements,start,pos);}
 }
 
 Statement BlockStatement() :
@@ -2504,84 +2561,95 @@ EmptyStatement EmptyStatement() :
 Expression StatementExpression() :
 {
   final Expression expr;
+  final Token operator;
 }
 {
   expr = PreIncDecExpression() {return expr;}
 |
   expr = PrimaryExpression()
-  [ <PLUS_PLUS> {return new PostfixedUnaryExpression(expr,
-                                                     OperatorIds.PLUS_PLUS,
-                                                     SimpleCharStream.getPosition());}
-  | <MINUS_MINUS> {return new PostfixedUnaryExpression(expr,
-                                                       OperatorIds.MINUS_MINUS,
-                                                       SimpleCharStream.getPosition());}
+  [ operator = <PLUS_PLUS> {return new PostfixedUnaryExpression(expr,
+                                                                OperatorIds.PLUS_PLUS,
+                                                                operator.sourceEnd);}
+  | operator = <MINUS_MINUS> {return new PostfixedUnaryExpression(expr,
+                                                                  OperatorIds.MINUS_MINUS,
+                                                                  operator.sourceEnd);}
   ]
   {return expr;}
 }
 
 SwitchStatement SwitchStatement() :
 {
-  final Expression variable;
+  Expression variable;
   final AbstractCase[] cases;
-  final int pos = SimpleCharStream.getPosition();
-  final Token switchToken;
+  final Token switchToken,lparenToken,rparenToken;
+  int pos;
 }
 {
-  switchToken = <SWITCH>
+  switchToken = <SWITCH> {pos = switchToken.sourceEnd+1;}
   try {
-    <LPAREN>
+    lparenToken = <LPAREN>
+    {pos = lparenToken.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "'(' expected after 'switch'";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
   try {
-    variable = Expression()
+    variable = Expression() {pos = variable.sourceEnd+1;}
   } catch (ParseException e) {
     if (errorMessage != null) {
       throw e;
     }
     errorMessage = "expression expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
+    variable = new ConstantIdentifier(SYNTAX_ERROR_CHAR,pos,pos);
   }
   try {
-    <RPAREN>
+    rparenToken = <RPAREN> {pos = rparenToken.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "')' expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
-  (cases = switchStatementBrace() | cases = switchStatementColon(switchToken.sourceStart, switchToken.sourceEnd))
-  {return new SwitchStatement(variable,cases,switchToken.sourceStart,SimpleCharStream.getPosition());}
+  (  cases = switchStatementBrace()
+   | cases = switchStatementColon(switchToken.sourceStart, switchToken.sourceEnd))
+  {return new SwitchStatement(variable,
+                              cases,
+                              switchToken.sourceStart,
+                              PHPParser.token.sourceEnd);}
 }
 
 AbstractCase[] switchStatementBrace() :
 {
   AbstractCase cas;
   final ArrayList cases = new ArrayList();
+  Token token;
+  int pos;
 }
 {
-  <LBRACE>
- ( cas = switchLabel0() {cases.add(cas);})*
+  token = <LBRACE> {pos = token.sourceEnd;}
+ ( cas = switchLabel0() {cases.add(cas);pos = cas.sourceEnd;})*
   try {
-    <RBRACE>
-    {
-    final AbstractCase[] abcase = new AbstractCase[cases.size()];
-    cases.toArray(abcase);
-    return abcase;}
+    token = <RBRACE>
+    {pos = token.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "'}' expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos+1;
+    errorEnd   = pos+1;
+    processParseExceptionDebug(e);
+  }
+  {
+    final AbstractCase[] abcase = new AbstractCase[cases.size()];
+    cases.toArray(abcase);
+    return abcase;
   }
 }
 /**
@@ -2593,9 +2661,11 @@ AbstractCase[] switchStatementColon(final int start, final int end) :
 {
   AbstractCase cas;
   final ArrayList cases = new ArrayList();
+  Token token;
+  int pos;
 }
 {
-  <COLON>
+  token = <COLON> {pos = token.sourceEnd;}
   {try {
   setMarker(fileToParse,
             "Ugly syntax detected, you should switch () {...} instead of switch (): ... enswitch;",
@@ -2606,28 +2676,29 @@ AbstractCase[] switchStatementColon(final int start, final int end) :
   } catch (CoreException e) {
     PHPeclipsePlugin.log(e);
   }}
-  ( cas = switchLabel0() {cases.add(cas);})*
+  ( cas = switchLabel0() {cases.add(cas);pos = cas.sourceEnd;})*
   try {
-    <ENDSWITCH>
+    token = <ENDSWITCH> {pos = token.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "'endswitch' expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos+1;
+    errorEnd   = pos+1;
+    processParseExceptionDebug(e);
   }
   try {
-    <SEMICOLON>
-    {
-    final AbstractCase[] abcase = new AbstractCase[cases.size()];
-    cases.toArray(abcase);
-    return abcase;}
+    token = <SEMICOLON> {pos = token.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "';' expected after 'endswitch' keyword";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos+1;
+    errorEnd   = pos+1;
+    processParseExceptionDebug(e);
+  }
+  {
+    final AbstractCase[] abcase = new AbstractCase[cases.size()];
+    cases.toArray(abcase);
+    return abcase;
   }
 }
 
@@ -2636,7 +2707,7 @@ AbstractCase switchLabel0() :
   final Expression expr;
   Statement statement;
   final ArrayList stmts = new ArrayList();
-  final int pos = SimpleCharStream.getPosition();
+  final Token token = PHPParser.token;
 }
 {
   expr = SwitchLabel()
@@ -2644,12 +2715,18 @@ AbstractCase switchLabel0() :
   | statement = htmlBlock()             {stmts.add(statement);})*
   [ statement = BreakStatement()        {stmts.add(statement);}]
   {
-  final Statement[] stmtsArray = new Statement[stmts.size()];
-  stmts.toArray(stmtsArray);
-  if (expr == null) {//it's a default
-    return new DefaultCase(stmtsArray,pos,SimpleCharStream.getPosition());
+    final int listSize = stmts.size();
+    final Statement[] stmtsArray = new Statement[listSize];
+    stmts.toArray(stmtsArray);
+    if (expr == null) {//it's a default
+      return new DefaultCase(stmtsArray,token.sourceStart,stmtsArray[listSize-1].sourceEnd);
+    }
+    if (listSize != 0) {
+      return new Case(expr,stmtsArray,expr.sourceStart,stmtsArray[listSize-1].sourceEnd);
+    } else {
+      return new Case(expr,stmtsArray,expr.sourceStart,expr.sourceEnd);
+    }
   }
-  return new Case(expr,stmtsArray,pos,SimpleCharStream.getPosition());}
 }
 
 /**
@@ -2702,19 +2779,22 @@ Break BreakStatement() :
 {
   Expression expression = null;
   final Token token, token2;
+  int pos;
 }
 {
-  token = <BREAK> [ expression = Expression() ]
+  token = <BREAK> {pos = token.sourceEnd+1;}
+  [ expression = Expression() {pos = expression.sourceEnd+1;}]
   try {
     token2 = <SEMICOLON>
+    {pos = token2.sourceEnd;}
   } catch (ParseException e) {
     errorMessage = "';' expected after 'break' keyword";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
-  {return new Break(expression, token.sourceStart, token2.sourceEnd);}
+  {return new Break(expression, token.sourceStart, pos);}
 }
 
 IfStatement IfStatement() :
@@ -2740,8 +2820,8 @@ Expression Condition(final String keyword) :
   } catch (ParseException e) {
     errorMessage = "'(' expected after " + keyword + " keyword";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length();
-    errorEnd   = errorStart +1;
+    errorStart = PHPParser.token.sourceEnd + 1;
+    errorEnd   = PHPParser.token.sourceEnd + 1;
     processParseExceptionDebug(e);
   }
   condition = Expression()
@@ -2750,8 +2830,8 @@ Expression Condition(final String keyword) :
   } catch (ParseException e) {
     errorMessage = "')' expected after " + keyword + " keyword";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
+    errorStart = condition.sourceEnd+1;
+    errorEnd   = condition.sourceEnd+1;
     processParseExceptionDebug(e);
   }
   {return condition;}
@@ -2865,59 +2945,61 @@ ElseIf ElseIfStatementColon() :
   final Expression condition;
   Statement statement;
   final ArrayList list = new ArrayList();
-  final int pos = SimpleCharStream.getPosition();
+  final Token elseifToken;
 }
 {
-  <ELSEIF> condition = Condition("elseif")
+  elseifToken = <ELSEIF> condition = Condition("elseif")
   <COLON> (  statement = Statement() {list.add(statement);}
            | statement = htmlBlock() {list.add(statement);})*
   {
-  final Statement[] stmtsArray = new Statement[list.size()];
+  final int sizeList = list.size();
+  final Statement[] stmtsArray = new Statement[sizeList];
   list.toArray(stmtsArray);
-  return new ElseIf(condition,stmtsArray ,pos,SimpleCharStream.getPosition());}
+  return new ElseIf(condition,stmtsArray ,
+                    elseifToken.sourceStart,
+                    stmtsArray[sizeList-1].sourceEnd);}
 }
 
 Else ElseStatementColon() :
 {
   Statement statement;
   final ArrayList list = new ArrayList();
-  final int pos = SimpleCharStream.getPosition();
+  final Token elseToken;
 }
 {
-  <ELSE> <COLON> (  statement = Statement() {list.add(statement);}
+  elseToken = <ELSE> <COLON> (  statement = Statement() {list.add(statement);}
                   | statement = htmlBlock() {list.add(statement);})*
   {
-  final Statement[] stmtsArray = new Statement[list.size()];
+  final int sizeList = list.size();
+  final Statement[] stmtsArray = new Statement[sizeList];
   list.toArray(stmtsArray);
-  return new Else(stmtsArray,pos,SimpleCharStream.getPosition());}
+  return new Else(stmtsArray,elseToken.sourceStart,stmtsArray[sizeList-1].sourceEnd);}
 }
 
 ElseIf ElseIfStatement() :
 {
   final Expression condition;
-  final Statement statement;
-  final ArrayList list = new ArrayList();
-  final int pos = SimpleCharStream.getPosition();
+  //final Statement statement;
+  final Token elseifToken;
+  final Statement[] statement = new Statement[1];
 }
 {
-  <ELSEIF> condition = Condition("elseif") statement = Statement() {list.add(statement);/*todo:do better*/}
+  elseifToken = <ELSEIF> condition = Condition("elseif") statement[0] = Statement()
   {
-  final Statement[] stmtsArray = new Statement[list.size()];
-  list.toArray(stmtsArray);
-  return new ElseIf(condition,stmtsArray,pos,SimpleCharStream.getPosition());}
+  return new ElseIf(condition,statement,elseifToken.sourceStart,statement[0].sourceEnd);}
 }
 
 WhileStatement WhileStatement() :
 {
   final Expression condition;
   final Statement action;
-  final int pos = SimpleCharStream.getPosition();
+  final Token whileToken;
 }
 {
-  <WHILE>
+  whileToken = <WHILE>
     condition = Condition("while")
-    action    = WhileStatement0(pos,pos + 5)
-    {return new WhileStatement(condition,action,pos,SimpleCharStream.getPosition());}
+    action    = WhileStatement0(whileToken.sourceStart,whileToken.sourceEnd)
+    {return new WhileStatement(condition,action,whileToken.sourceStart,action.sourceEnd);}
 }
 
 Statement WhileStatement0(final int start, final int end) :
@@ -2969,90 +3051,108 @@ DoStatement DoStatement() :
 {
   final Statement action;
   final Expression condition;
-  final Token token, token2;
+  final Token token;
+  Token token2 = null;
 }
 {
   token = <DO> action = Statement() <WHILE> condition = Condition("while")
   try {
     token2 = <SEMICOLON>
-    {return new DoStatement(condition,action,token.sourceStart,token2.sourceEnd);}
   } catch (ParseException e) {
     errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = condition.sourceEnd+1;
+    errorEnd   = condition.sourceEnd+1;
+    processParseExceptionDebug(e);
+  }
+  {
+    if (token2 == null) {
+      return new DoStatement(condition,action,token.sourceStart,condition.sourceEnd);
+    }
+    return new DoStatement(condition,action,token.sourceStart,token2.sourceEnd);
   }
 }
 
 ForeachStatement ForeachStatement() :
 {
-  Statement statement;
-  Expression expression;
-  ArrayVariableDeclaration variable;
-  Token token;
+  Statement statement = null;
+  Expression expression = null;
+  ArrayVariableDeclaration variable = null;
+  Token foreachToken;
+  Token lparenToken = null;
+  Token asToken = null;
+  Token rparenToken = null;
+  int pos;
 }
 {
-  token = <FOREACH>
-    try {
-    <LPAREN>
+  foreachToken = <FOREACH>
+  try {
+    lparenToken = <LPAREN>
+    {pos = lparenToken.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "'(' expected after 'foreach' keyword";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = foreachToken.sourceEnd+1;
+    errorEnd   = foreachToken.sourceEnd+1;
+    processParseExceptionDebug(e);
+    {pos = foreachToken.sourceEnd+1;}
   }
   try {
     expression = Expression()
+    {pos = expression.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "variable expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
   try {
-    <AS>
+    asToken = <AS>
+    {pos = asToken.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "'as' expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
   try {
     variable = ArrayVariable()
+    {pos = variable.sourceEnd+1;}
   } catch (ParseException e) {
+    if (errorMessage != null) throw e;
     errorMessage = "variable expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
   try {
-    <RPAREN>
+    rparenToken = <RPAREN>
+    {pos = rparenToken.sourceEnd+1;}
   } catch (ParseException e) {
     errorMessage = "')' expected after 'foreach' keyword";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
   try {
     statement = Statement()
+    {pos = rparenToken.sourceEnd+1;}
   } catch (ParseException e) {
     if (errorMessage != null) throw e;
     errorMessage = "statement expected";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    errorStart = pos;
+    errorEnd   = pos;
+    processParseExceptionDebug(e);
   }
   {return new ForeachStatement(expression,
                                variable,
                                statement,
-                               token.sourceStart,
+                               foreachToken.sourceStart,
                                statement.sourceEnd);}
 
 }
@@ -3063,8 +3163,8 @@ ForeachStatement ForeachStatement() :
  */
 ForStatement ForStatement() :
 {
-final Token token,token2;
-final int pos = SimpleCharStream.getPosition();
+final Token token,tokenEndFor,token2,tokenColon;
+int pos;
 Expression[] initializations = null;
 Expression condition = null;
 Expression[] increments = null;
@@ -3094,8 +3194,8 @@ final ArrayList list = new ArrayList();
                                token.sourceStart,
                                action.sourceEnd);}
     |
-      <COLON>
-      (action = Statement() {list.add(action);})*
+      tokenColon = <COLON> {pos = tokenColon.sourceEnd+1;}
+      (action = Statement() {list.add(action);pos = action.sourceEnd+1;})*
       {
         try {
         setMarker(fileToParse,
@@ -3109,34 +3209,36 @@ final ArrayList list = new ArrayList();
         }
       }
       try {
-        <ENDFOR>
+        tokenEndFor = <ENDFOR>
+        {pos = tokenEndFor.sourceEnd+1;}
       } catch (ParseException e) {
         errorMessage = "'endfor' expected";
         errorLevel   = ERROR;
-        errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-        errorEnd   = SimpleCharStream.getPosition() + 1;
-        throw e;
+        errorStart = pos;
+        errorEnd   = pos;
+        processParseExceptionDebug(e);
       }
       try {
         token2 = <SEMICOLON>
-        {
-        final Statement[] stmtsArray = new Statement[list.size()];
-        list.toArray(stmtsArray);
-        return new ForStatement(initializations,
-                                condition,
-                                increments,
-                                new Block(stmtsArray,
-                                          stmtsArray[0].sourceStart,
-                                          stmtsArray[stmtsArray.length-1].sourceEnd),
-                                token.sourceStart,
-                                token2.sourceEnd);}
+        {pos = token2.sourceEnd+1;}
       } catch (ParseException e) {
         errorMessage = "';' expected after 'endfor' keyword";
         errorLevel   = ERROR;
-        errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-        errorEnd   = SimpleCharStream.getPosition() + 1;
-        throw e;
+        errorStart = pos;
+        errorEnd   = pos;
+        processParseExceptionDebug(e);
       }
+      {
+      final Statement[] stmtsArray = new Statement[list.size()];
+      list.toArray(stmtsArray);
+      return new ForStatement(initializations,
+                              condition,
+                              increments,
+                              new Block(stmtsArray,
+                                        stmtsArray[0].sourceStart,
+                                        stmtsArray[stmtsArray.length-1].sourceEnd),
+                              token.sourceStart,
+                              pos);}
     )
 }
 
@@ -3171,38 +3273,66 @@ Expression[] StatementExpressionList() :
 Continue ContinueStatement() :
 {
   Expression expr = null;
-  final Token token,token2;
+  final Token token;
+  Token token2 = null;
 }
 {
   token = <CONTINUE> [ expr = Expression() ]
   try {
     token2 = <SEMICOLON>
-    {return new Continue(expr,token.sourceStart,token2.sourceEnd);}
   } catch (ParseException e) {
     errorMessage = "';' expected after 'continue' statement";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
+    if (expr == null) {
+      errorStart = token.sourceEnd+1;
+      errorEnd   = token.sourceEnd+1;
+    } else {
+      errorStart = expr.sourceEnd+1;
+      errorEnd   = expr.sourceEnd+1;
+    }
+    processParseExceptionDebug(e);
+  }
+  {
+    if (token2 == null) {
+      if (expr == null) {
+        return new Continue(expr,token.sourceStart,token.sourceEnd);
+      }
+      return new Continue(expr,token.sourceStart,expr.sourceEnd);
+    }
+    return new Continue(expr,token.sourceStart,token2.sourceEnd);
   }
 }
 
 ReturnStatement ReturnStatement() :
 {
   Expression expr = null;
-  final Token token,token2;
+  final Token token;
+  Token token2 = null;
 }
 {
   token = <RETURN> [ expr = Expression() ]
   try {
     token2 = <SEMICOLON>
-    {return new ReturnStatement(expr,token.sourceStart,token2.sourceEnd);}
   } catch (ParseException e) {
     errorMessage = "';' expected after 'return' statement";
     errorLevel   = ERROR;
-    errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
-    errorEnd   = SimpleCharStream.getPosition() + 1;
-    throw e;
- }
+    if (expr == null) {
+      errorStart = token.sourceEnd+1;
+      errorEnd   = token.sourceEnd+1;
+    } else {
+      errorStart = expr.sourceEnd+1;
+      errorEnd   = expr.sourceEnd+1;
+    }
+    processParseExceptionDebug(e);
+  }
+  {
+    if (token2 == null) {
+      if (expr == null) {
+        return new ReturnStatement(expr,token.sourceStart,token.sourceEnd);
+      }
+      return new ReturnStatement(expr,token.sourceStart,expr.sourceEnd);
+    }
+    return new ReturnStatement(expr,token.sourceStart,token2.sourceEnd);
+  }
 }