cddl 0.2.1 → 0.3.0

package/build/lexer.js

@@ -1,13 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tokens_1 = require("./tokens");
-const utils_1 = require("./utils");
-const constants_1 = require("./constants");
-class Lexer {
+import { Tokens } from './tokens.js';
+import { isLetter, isAlphabeticCharacter, isDigit, hasSpecialNumberCharacter } from './utils.js';
+import { WHITESPACE_CHARACTERS } from './constants.js';
+export default class Lexer {
+    input;
+    position = 0;
+    readPosition = 0;
+    ch = 0;
     constructor(source) {
-        this.position = 0;
-        this.readPosition = 0;
-        this.ch = 0;
         this.input = source;
         this.readChar();
     }
@@ -21,89 +20,122 @@ class Lexer {
         this.position = this.readPosition;
         this.readPosition++;
     }
+    getLocation() {
+        const position = this.position - 2;
+        const sourceLines = this.input.split('\n');
+        const sourceLineLength = sourceLines.map((l) => l.length);
+        let i = 0;
+        for (const [line, lineLength] of Object.entries(sourceLineLength)) {
+            i += lineLength + 1;
+            const lineBegin = i - lineLength;
+            if (i > position) {
+                const lineBegin = i - lineLength;
+                return {
+                    line: parseInt(line, 10),
+                    position: position - lineBegin + 1
+                };
+            }
+        }
+        return { line: 0, position: 0 };
+    }
+    getLine(lineNumber) {
+        return this.input.split('\n')[lineNumber];
+    }
+    getLocationInfo() {
+        const loc = this.getLocation();
+        const line = loc ? this.getLine(loc.line) : '';
+        let locationInfo = line + '\n';
+        locationInfo += ' '.repeat(loc?.position || 0) + '^\n';
+        locationInfo += ' '.repeat(loc?.position || 0) + '|\n';
+        return locationInfo;
+    }
     nextToken() {
         let token;
         this.skipWhitespace();
         const Literal = String.fromCharCode(this.ch);
         switch (this.ch) {
             case '='.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.ASSIGN, Literal };
+                token = { Type: Tokens.ASSIGN, Literal };
                 break;
             case '('.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.LPAREN, Literal };
+                token = { Type: Tokens.LPAREN, Literal };
                 break;
             case ')'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.RPAREN, Literal };
+                token = { Type: Tokens.RPAREN, Literal };
                 break;
             case '{'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.LBRACE, Literal };
+                token = { Type: Tokens.LBRACE, Literal };
                 break;
             case '}'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.RBRACE, Literal };
+                token = { Type: Tokens.RBRACE, Literal };
                 break;
             case '['.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.LBRACK, Literal };
+                token = { Type: Tokens.LBRACK, Literal };
                 break;
             case ']'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.RBRACK, Literal };
+                token = { Type: Tokens.RBRACK, Literal };
                 break;
             case '<'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.LT, Literal };
+                token = { Type: Tokens.LT, Literal };
                 break;
             case '>'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.GT, Literal };
+                token = { Type: Tokens.GT, Literal };
                 break;
             case '+'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.PLUS, Literal };
+                token = { Type: Tokens.PLUS, Literal };
                 break;
             case ','.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.COMMA, Literal };
+                token = { Type: Tokens.COMMA, Literal };
                 break;
             case '.'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.DOT, Literal };
+                token = { Type: Tokens.DOT, Literal };
                 break;
             case ':'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.COLON, Literal };
+                token = { Type: Tokens.COLON, Literal };
                 break;
             case '?'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.QUEST, Literal };
+                token = { Type: Tokens.QUEST, Literal };
                 break;
             case '/'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.SLASH, Literal };
+                token = { Type: Tokens.SLASH, Literal };
                 break;
             case '*'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.ASTERISK, Literal };
+                token = { Type: Tokens.ASTERISK, Literal };
                 break;
             case '^'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.CARET, Literal };
+                token = { Type: Tokens.CARET, Literal };
                 break;
             case '#'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.HASH, Literal };
+                token = { Type: Tokens.HASH, Literal };
                 break;
             case '~'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.TILDE, Literal };
+                token = { Type: Tokens.TILDE, Literal };
                 break;
             case '"'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.STRING, Literal: this.readString() };
+                token = { Type: Tokens.STRING, Literal: this.readString() };
                 break;
             case ';'.charCodeAt(0):
-                token = { Type: tokens_1.Tokens.COMMENT, Literal: this.readComment() };
+                token = { Type: Tokens.COMMENT, Literal: this.readComment() };
                 break;
             case 0:
-                token = { Type: tokens_1.Tokens.EOF, Literal: '' };
+                token = { Type: Tokens.EOF, Literal: '' };
                 break;
             default: {
-                if (utils_1.isAlphabeticCharacter(Literal)) {
-                    return { Type: tokens_1.Tokens.IDENT, Literal: this.readIdentifier() };
+                if (isAlphabeticCharacter(Literal)) {
+                    return { Type: Tokens.IDENT, Literal: this.readIdentifier() };
                 }
-                else if (utils_1.isDigit(Literal)) {
+                else if (
+                // positive number
+                isDigit(Literal) ||
+                    // negative number
+                    (this.ch === Tokens.MINUS.charCodeAt(0) && isDigit(this.input[this.readPosition]))) {
                     const numberOrFloat = this.readNumberOrFloat();
                     return {
-                        Type: numberOrFloat.includes(tokens_1.Tokens.DOT) ? tokens_1.Tokens.FLOAT : tokens_1.Tokens.NUMBER,
+                        Type: numberOrFloat.includes(Tokens.DOT) ? Tokens.FLOAT : Tokens.NUMBER,
                         Literal: numberOrFloat
                     };
                 }
-                token = { Type: tokens_1.Tokens.ILLEGAL, Literal: '' };
+                token = { Type: Tokens.ILLEGAL, Literal: '' };
             }
         }
         this.readChar();
@@ -117,16 +149,16 @@ class Lexer {
          */
         while (
         // a letter (a-z, A-Z)
-        utils_1.isLetter(String.fromCharCode(this.ch)) ||
+        isLetter(String.fromCharCode(this.ch)) ||
             // a digit (0-9)
-            utils_1.isDigit(String.fromCharCode(this.ch)) ||
+            isDigit(String.fromCharCode(this.ch)) ||
             // and special characters (-, _, @, ., $)
             [
-                tokens_1.Tokens.MINUS.charCodeAt(0),
-                tokens_1.Tokens.UNDERSCORE.charCodeAt(0),
-                tokens_1.Tokens.ATSIGN.charCodeAt(0),
-                tokens_1.Tokens.DOT.charCodeAt(0),
-                tokens_1.Tokens.DOLLAR.charCodeAt(0)
+                Tokens.MINUS.charCodeAt(0),
+                Tokens.UNDERSCORE.charCodeAt(0),
+                Tokens.ATSIGN.charCodeAt(0),
+                Tokens.DOT.charCodeAt(0),
+                Tokens.DOLLAR.charCodeAt(0)
             ].includes(this.ch)) {
             this.readChar();
         }
@@ -142,7 +174,7 @@ class Lexer {
     readString() {
         const position = this.position;
         this.readChar(); // eat "
-        while (this.ch && String.fromCharCode(this.ch) !== tokens_1.Tokens.QUOT) {
+        while (this.ch && String.fromCharCode(this.ch) !== Tokens.QUOT) {
             this.readChar(); // eat any character until "
         }
         return this.input.slice(position + 1, this.position).trim();
@@ -155,19 +187,19 @@ class Lexer {
          */
         while (
         // a number
-        utils_1.isDigit(String.fromCharCode(this.ch)) ||
+        isDigit(String.fromCharCode(this.ch)) ||
             // a special character, e.g. ".", "x" and "b"
-            utils_1.hasSpecialNumberCharacter(this.ch)) {
+            hasSpecialNumberCharacter(this.ch)) {
             /**
              * ensure we respect ranges, e.g. 0..10
              * so break after the second dot and adjust read position
              */
-            if (utils_1.hasSpecialNumberCharacter(this.ch) && foundSpecialCharacter) {
+            if (hasSpecialNumberCharacter(this.ch) && foundSpecialCharacter) {
                 this.position--;
                 this.readPosition--;
                 break;
             }
-            if (utils_1.hasSpecialNumberCharacter(this.ch)) {
+            if (hasSpecialNumberCharacter(this.ch)) {
                 foundSpecialCharacter = true;
             }
             this.readChar(); // eat any character until a non digit or a 2nd dot
@@ -175,9 +207,8 @@ class Lexer {
         return this.input.slice(position, this.position).trim();
     }
     skipWhitespace() {
-        while (constants_1.WHITESPACE_CHARACTERS.includes(String.fromCharCode(this.ch))) {
+        while (WHITESPACE_CHARACTERS.includes(String.fromCharCode(this.ch))) {
             this.readChar();
         }
     }
 }
-exports.default = Lexer;

package/build/parser.d.ts

@@ -1,11 +1,12 @@
-import Lexer from './lexer';
-import { Token } from './tokens';
-import { Assignment } from './ast';
+import Lexer from './lexer.js';
+import { Token } from './tokens.js';
+import { Assignment } from './ast.js';
 export default class Parser {
+    #private;
     l: Lexer;
     curToken: Token;
     peekToken: Token;
-    constructor(l: Lexer);
+    constructor(filePath: string);
     private nextToken;
     private parseAssignments;
     private parseAssignmentValue;
@@ -25,5 +26,6 @@ export default class Parser {
      */
     private parseComment;
     parse(): Assignment[];
+    private parserError;
 }
 //# sourceMappingURL=parser.d.ts.map

package/build/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,SAAS,CAAA;AAE3B,OAAO,EAAE,KAAK,EAAU,MAAM,UAAU,CAAC;AAGzC,OAAO,EAE2C,UAAU,EAE3D,MAAM,OAAO,CAAA;AAKd,MAAM,CAAC,OAAO,OAAO,MAAM;IACvB,CAAC,EAAE,KAAK,CAAC;IAET,QAAQ,EAAE,KAAK,CAAa;IAC5B,SAAS,EAAE,KAAK,CAAa;gBAEhB,CAAC,EAAE,KAAK;IAOrB,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,gBAAgB;IA8BxB,OAAO,CAAC,oBAAoB;IA4O5B,OAAO,CAAC,wBAAwB;IAahC;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,iBAAiB;IA8GzB,OAAO,CAAC,kBAAkB;IAwC1B,OAAO,CAAC,gBAAgB;IA4DxB;;OAEG;IACH,OAAO,CAAC,YAAY;IAUpB,KAAK;CAsBR"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,YAAY,CAAA;AAE9B,OAAO,EAAE,KAAK,EAAU,MAAM,aAAa,CAAC;AAG5C,OAAO,EAE2C,UAAU,EAE3D,MAAM,UAAU,CAAA;AAKjB,MAAM,CAAC,OAAO,OAAO,MAAM;;IAEvB,CAAC,EAAE,KAAK,CAAC;IAET,QAAQ,EAAE,KAAK,CAAa;IAC5B,SAAS,EAAE,KAAK,CAAa;gBAEhB,QAAQ,EAAE,MAAM;IAQ7B,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,gBAAgB;IA8BxB,OAAO,CAAC,oBAAoB;IA2R5B,OAAO,CAAC,wBAAwB;IAahC;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,iBAAiB;IA8GzB,OAAO,CAAC,kBAAkB;IAwC1B,OAAO,CAAC,gBAAgB;IA4DxB;;OAEG;IACH,OAAO,CAAC,YAAY;IAUpB,KAAK;IAuBL,OAAO,CAAC,WAAW;CAKtB"}