Fix positions and missing file paths

Author: efekos

src/ast.ts

@@ -24,17 +24,18 @@ export namespace syxparser {
     /**
      * Parses the token list given into statements and expressions.
      * @param {Token[]} t Token list to parse.
+     * @param {string} _filePath Path of the file that is being parsed. 
      * @returns Main {@link ProgramStatement} containing all other statements.
      * @author efekos
-     * @version 1.0.2
+     * @version 1.0.3
      * @since 0.0.1-alpha
      */
-    export function parseTokens(t: Token[],filePath:string): ProgramStatement {
+    export function parseTokens(t: Token[],_filePath:string): ProgramStatement {
         tokens = t;
 
         const eof = t.find(r => r.type === TokenType.EndOfFile);
         program = { body: [], type: NodeType.Program, range: { end: eof.range.end, start: { line: 0, character: 0 } } };
-        this.filePath = filePath;
+        filePath = _filePath;
 
         while (canGo()) {
             parseStatement();
@@ -404,14 +405,15 @@ export namespace sysparser {
      * @param {Token[]} t Token list to parse.
      * @returns Main {@link ProgramStatement} containing all other statements.
      * @author efekos
-     * @version 1.0.1
+     * @version 1.0.2
      * @since 0.0.1-alpha
      */
-    export function parseTokens(t: Token[]): ProgramStatement {
+    export function parseTokens(t: Token[],_filePath:string): ProgramStatement {
         tokens = t;
 
         const eof = t.find(r => r.type === TokenType.EndOfFile);
         program = { body: [], type: NodeType.Program, range: { start: { character: 0, line: 0 }, end: eof.range.end } };
+        filePath = _filePath;
 
         while (canGo()) {
             parseStatement();

src/compiler.ts

@@ -65,7 +65,7 @@ export class SyntaxScriptCompiler {
      * Compiles one .syx file from the path given.
      * @param {string} file Path to a file to compile.
      * @author efekos
-     * @version 1.0.3
+     * @version 1.0.4
      * @since 0.0.1-alpha
      */
     public compileSyx(file: string) {
@@ -194,10 +194,10 @@ export class SyntaxScriptCompiler {
      * @param {string} file Path to the .sys file to compile.
      * @author efekos
      * @since 0.0.1-alpha
-     * @version 1.0.2
+     * @version 1.0.3
      */
     public compileSys(file: string) {
-        const ast = sysparser.parseTokens(tokenizeSys(readFileSync(file).toString()));
+        const ast = sysparser.parseTokens(tokenizeSys(readFileSync(file).toString()),file);
 
         //# Handle import statements 
         var imported: AnyExportable[] = [];

src/diagnostic.ts

@@ -1,4 +1,4 @@
-import { CodeAction, CodeActionKind, Diagnostic, DiagnosticSeverity, DocumentDiagnosticReportKind, FullDocumentDiagnosticReport } from 'lsp-types';
+import { CodeAction, CodeActionKind, Diagnostic, DiagnosticSeverity, DocumentDiagnosticReportKind, FullDocumentDiagnosticReport,Range } from 'lsp-types';
 import { sysparser, syxparser } from './ast.js';
 import { tokenizeSys, tokenizeSyx } from './lexer.js';
 import { isCompilerError } from './types.js';
@@ -27,7 +27,7 @@ export function createSyntaxScriptDiagnosticReport(filePath: string, fileContent
         if (isCompilerError(error)) {
             items.push({
                 message: error.message,
-                range: error.range,
+                range: subRange(error.range),
                 severity: DiagnosticSeverity.Error,
                 source: 'syntax-script',
                 data: [
@@ -38,7 +38,7 @@ export function createSyntaxScriptDiagnosticReport(filePath: string, fileContent
                             changes: {
                                 [filePath]: [
                                     {
-                                        range:error.range,
+                                        range:subRange(error.range),
                                         newText:'test'
                                     }
                                 ]
@@ -54,3 +54,13 @@ export function createSyntaxScriptDiagnosticReport(filePath: string, fileContent
     }
 
 }
+
+
+/**
+ * Modifies the given range to be zero-based.
+ * @param {Range} r Any range. 
+ * @returns Same range with every value decreased by 1.
+ */
+function subRange(r:Range):Range {
+    return {start:{character:r.start.character-1,line:r.start.line-1},end:{character:r.end.character-1,line:r.end.line-1}};
+}

src/lexer.ts

@@ -69,15 +69,15 @@ function tpr(start: Position, end: Position): Range {
  * @param {string} source Source string.
  * @returns A list of tokens generated from source string.
  * @author efekos
- * @version 1.0.6
+ * @version 1.0.7
  * @since 0.0.1-alpha
  * @throws LexerError if an error occurs.
  */
 export function tokenizeSyx(source: string): Token[] {
     const tokens: Token[] = [];
     const src = source.split('');
     let curPos = 0;
-    let curLine = 0;
+    let curLine = 1;
 
     while (src.length > 0) {
         if (src[0] === '/' && src[1] === '/') {
@@ -138,15 +138,15 @@ export function tokenizeSyx(source: string): Token[] {
  * @param {string} source Source string.
  * @returns A list of tokens generated from the source file.
  * @author efekos
- * @version 1.0.3
+ * @version 1.0.4
  * @since 0.0.1-alpha
  */
 export function tokenizeSys(source: string): Token[] {
     const src = source.split('');
     const tokens: Token[] = [];
 
     let curPos = 0;
-    let curLine = 0;
+    let curLine = 1;
 
     while (src.length > 0 && `${src[0]}${src[1]}${src[2]}` !== ':::') {
         if (src[0] === ';') tokens.push({ type: TokenType.Semicolon, value: src.shift(), range: opr(curLine, curPos++) });