Added error code fragment output in case of some issues of the code t…

…o rapify

src/optimizer/test/treeOptimizer.spec.ts

@@ -169,7 +169,7 @@ describe('optimizer/treeOptimizer', () => {
         it('should try to parse string nodes and catch ParserErrors', () => {
             const value = new StringNode('str1');
 
-            spyOn(ExpressionParser.prototype, 'parseExpression').and.callFake(() => { throw new ParserError('msg', 0, 0); });
+            spyOn(ExpressionParser.prototype, 'parseExpression').and.callFake(() => { throw new ParserError('msg', 0, 0, 0); });
             spyOn(ExpressionResolver.prototype, 'resolve').and.callThrough();
 
             const optimizer = new TreeOptimizer();
@@ -184,7 +184,7 @@ describe('optimizer/treeOptimizer', () => {
         it('should try to parse string nodes and catch NodeErrors', () => {
             const value = new StringNode('str1');
 
-            spyOn(ExpressionParser.prototype, 'parseExpression').and.callFake(() => { throw new NodeError('msg', 0, 0); });
+            spyOn(ExpressionParser.prototype, 'parseExpression').and.callFake(() => { throw new NodeError('msg', 0, 0, 0); });
             spyOn(ExpressionResolver.prototype, 'resolve').and.callThrough();
 
             const optimizer = new TreeOptimizer();

src/parser/charIterator.ts

@@ -83,4 +83,8 @@ export class CharIterator implements Iterator<string> {
     get column(): number {
         return this._column;
     }
+
+    get index(): number {
+        return this._bufferIndex - 1;
+    }
 }

src/parser/charIteratorCheckpoint.ts

@@ -42,6 +42,10 @@ export class CharIteratorCheckpoint implements Checkpoint<string> {
         return this._params.iterator.column;
     }
 
+    get index(): number {
+        return this._params.iterator.index;
+    }
+
     get depleted(): boolean {
         return this._params.iterator.depleted;
     }

src/parser/iterator.ts

@@ -9,6 +9,8 @@ export interface Iterator<T> {
 
     column: number;
 
+    index: number;
+
     createCheckpoint(): Checkpoint<T>;
 }
 

src/parser/nodeError.ts

@@ -1,16 +1,19 @@
 import '../error';
 
 export class NodeError extends Error {
-    constructor(message: string, line: number, column: number) {
+    constructor(message: string, line: number, column: number, index: number) {
         super(message);
         Error.captureStackTrace(this, NodeError);
 
         this.line = line;
         this.comumn = column;
+        this.index = index;
         this.name = 'NodeError';
     }
 
-    line: number;
+    readonly line: number;
 
-    comumn: number;
+    readonly comumn: number;
+
+    readonly index: number;
 }

src/parser/nodes/readers/expressionReader.ts

@@ -29,9 +29,9 @@ export class ExpressionReader {
             if (halt) { break; }
 
             if (iterator.current.tokenType === tokenTypes.newline) {
-                throw new NodeError(`; expected at the end of the line`, iterator.line, iterator.column);
+                throw new NodeError(`; expected at the end of the line`, iterator.line, iterator.column, iterator.index);
             } else if (iterator.current.tokenType !== tokenTypes.mathOp) {
-                throw new NodeError(`Math operator expected but was "${iterator.current.tokenValue}" of type "${iterator.current.tokenType}"`, iterator.line, iterator.column);
+                throw new NodeError(`Math operator expected but was "${iterator.current.tokenValue}" of type "${iterator.current.tokenType}"`, iterator.line, iterator.column, iterator.index);
             }
 
             const operator = iterator.current;
@@ -110,7 +110,7 @@ export class ExpressionReader {
                 break;
             }
             default: {
-                throw new NodeError(`Unexpected token "${token.tokenValue}" of type "${token.tokenType}"`, this._reader.iterator.line, this._reader.iterator.column);
+                throw new NodeError(`Unexpected token "${token.tokenValue}" of type "${token.tokenType}"`, this._reader.iterator.line, this._reader.iterator.column, this._reader.iterator.index);
             }
         }
 
@@ -125,7 +125,7 @@ export class ExpressionReader {
             const result = token.tokenValue === mathOperators.minus ? new MathNegNode(node) : node;
             return result;
         } else {
-            throw new NodeError(`Unexpected math operator "${token.tokenValue}" of type "${token.tokenType}"`, this._reader.iterator.line, this._reader.iterator.column);
+            throw new NodeError(`Unexpected math operator "${token.tokenValue}" of type "${token.tokenType}"`, this._reader.iterator.line, this._reader.iterator.column, this._reader.iterator.index);
         }
     }
 

src/parser/nodes/readers/readerUtility.ts

@@ -29,15 +29,15 @@ export class ReaderUtility {
         const eof = this.moveToNextTokenOrEof();
         if (eof) {
             this._resetDefaults();
-            throw new NodeError(`${errorDescription} expected but got EOF`, this._iterator.line, this._iterator.column);
+            throw new NodeError(`${errorDescription} expected but got EOF`, this._iterator.line, this._iterator.column, this._iterator.index);
         }
 
         const current = this._iterator.current;
         if (expectedTokenTypes.indexOf(current.tokenType) < 0) {
             this._resetDefaults();
 
             const value = this._getTokenValue(current);
-            throw new NodeError(`${errorDescription} expected but got "${value}"`, this._iterator.line, this._iterator.column);
+            throw new NodeError(`${errorDescription} expected but got "${value}"`, this._iterator.line, this._iterator.column, this._iterator.index);
         }
 
         this._resetDefaults();
@@ -76,7 +76,7 @@ export class ReaderUtility {
         const eof = this.moveToNextTokenOrEof();
         if (eof) {
             this._resetDefaults();
-            throw new NodeError(`Any token expected but got EOF`, this._iterator.line, this._iterator.column);
+            throw new NodeError(`Any token expected but got EOF`, this._iterator.line, this._iterator.column, this._iterator.index);
         }
     }
 }

src/parser/nodes/readers/readers.ts

@@ -20,6 +20,6 @@ export class Readers {
 
         const iterator = reader.iterator;
         const message = `Unexpected token: \"${iterator.current.tokenValue}\", type: ${iterator.current.tokenType}`;
-        throw new NodeError(message, iterator.line, iterator.column);
+        throw new NodeError(message, iterator.line, iterator.column, iterator.index);
     }
 }