@jeefo/parser - npm Package Compare versions

Comparing version 0.0.25 to 0.0.26

index.js

 /* -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
 * File Name   : index.js
 * Created at  : 2019-01-23
-* Updated at  : 2019-10-31
+* Updated at  : 2020-10-22
 * Author      : jeefo
@@ -61,8 +61,8 @@ * Purpose     :
 
-        this.debug          = false;
-        this.prev_node      = null;
-        this.ending_index   = 0;
-        this.is_terminated  = null;
-        this.previous_nodes = null;
-
+        this.is_terminated        = true;
+        this.prepare_next_node    = true;
+        this.prev_node            = null;
+        this.prev_token           = null;
+        this.previous_nodes       = null;
+        this.previous_tokens      = null;
         this.next_token           = null;
@@ -92,26 +92,36 @@ this.next_node_definition = null;
         const {
-            next_token           : current_token,
-            current_state        : prev_state,
-            next_node_definition : current_node_def,
-            prev_node, previous_nodes
+            current_state,
+            is_terminated,
+            prev_node,
+            previous_nodes,
+            prev_token,
+            previous_tokens,
+            next_token,
+            next_node_definition,
         } = this;
 
         this.tokenizer.streamer.cursor.save();
-        this.prev_node      = null;
-        this.current_state  = null;
-        this.previous_nodes = [];
+        this.is_terminated = false;
+
+        // Taking account `onpreparation` event
         this.prepare_next_node_definition(throw_end_of_stream);
-        const next_token = this.next_token;
+        const result_next_token = this.next_token;
 
         this.tokenizer.streamer.cursor.rollback();
+        this.is_terminated        = is_terminated;
+        this.current_state        = current_state;
         this.prev_node            = prev_node;
-        this.next_token           = current_token;
-        this.current_state        = prev_state;
         this.previous_nodes       = previous_nodes;
-        this.next_node_definition = current_node_def;
+        this.prev_token           = prev_token;
+        this.previous_tokens      = previous_tokens;
+        this.next_token           = next_token;
+        this.next_node_definition = next_node_definition;
 
-        return next_token;
+        return result_next_token;
     }
 
     prepare_next_node_definition (throw_end_of_stream) {
+        if (this.next_token) {
+            this.previous_tokens.push(this.prev_token = this.next_token);
+        }
         this.next_token = this.tokenizer.get_next_token();
@@ -141,2 +151,3 @@
         } else {
+            this.is_terminated        = true;
             this.next_node_definition = null;
@@ -148,4 +159,7 @@ }
         this.prev_node            = null;
+        this.prev_token           = null;
+        this.previous_nodes       = [];
+        this.previous_tokens      = [];
         this.is_terminated        = false;
-        this.previous_nodes       = [];
+        this.prepare_next_node    = true;
         this.next_node_definition = null;
@@ -185,11 +199,5 @@
     terminate (node) {
-        if (node === undefined) {
-            if (this.debug) { console.log(this); }
-            throw new Error("argument must be AST_Node object.");
-        }
-
+        if (node) this.end(node);
         this.is_terminated        = true;
-        this.next_token           = null;
         this.next_node_definition = null;
-        assign(this.tokenizer.streamer.cursor.position, node.end);
     }
@@ -199,37 +207,27 @@
         if (typeof left_precedence !== "number") {
-            if (this.debug) { console.log(this); }
             throw new Error("Invalid left precedence");
         }
 
-        while (this.next_token) {
-            if (this.next_node_definition === null) {
-                if (this.throw_not_found) {
-                    this.throw_unexpected_token(
-                        "AST_Node_Definition is not found"
-                    );
-                }
-                break;
-            }
-            if (this.next_node_definition.precedence <= left_precedence) {
-                break;
-            }
+        const {cursor} = this.tokenizer.streamer;
+        while (! this.is_terminated) {
+            const {next_node_definition} = this;
+            if (! next_node_definition) this.throw_unexpected_token(
+                "AST_Node_Definition is not found"
+            );
+            if (next_node_definition.precedence <= left_precedence) break;
+            const node = this.generate_next_node();
+            this.set_prev_node(node);
 
-            this.ending_index = this.next_token.end.index;
-            this.set_prev_node(this.generate_next_node());
-
-            // Debug only
+            // DEBUG_START
             if ([null, undefined].includes(this.current_state)) {
                 this.throw_unexpected_token("Invalid current_state");
             }
-            // Debug only
+            // DEBUG_END
 
-            if (this.next_token) {
-                if (this.next_token.end.index === this.ending_index) {
-                    this.prepare_next_node_definition();
-                } else {
-                    this.next_node_definition = this.ast_node_table.find(
-                        this.next_token, this
-                    );
-                }
-            }
+            (
+                ! this.is_terminated &&
+                this.prepare_next_node &&
+                node.end.index === cursor.position.index &&
+                this.prepare_next_node_definition()
+            );
         }
@@ -289,7 +287,7 @@
     end (node) {
-        this.ending_index = node.end.index;
+        assign(this.tokenizer.streamer.cursor.position, node.end);
     }
 
     refine (state_name, input_node) {
-        this.change_state(state_name, undefined);
+        this.change_state(state_name);
         if (! this.next_node_definition) {
@@ -321,6 +319,7 @@ this.throw_unexpected_token(
     expect (expectation, condition) {
-        if (! condition(this)) {
-            const { streamer } = this.tokenizer;
+        if (typeof condition === "function") condition = condition(this);
+        if (! condition) {
+            const {streamer} = this.tokenizer;
             this.throw_unexpected_token(
-                `Expected ${ expectation } instead saw: ${
+                `Expected ${expectation} instead saw: ${
                     streamer.substring_from_token(this.next_token)
@@ -332,7 +331,8 @@ }`
 
+    to_string (node) {
+        return this.tokenizer.streamer.substring_from_token(node);
+    }
+
     throw_unexpected_token (error_message, token) {
-        if (token) {
-            this.next_token = token;
-        }
-        if (this.debug) { console.log(this); }
+        if (token) this.next_token = token;
         throw new UnexpectedTokenException(this, error_message);
@@ -350,6 +350,10 @@ }
     throw_unexpected_end_of_stream () {
-        if (this.debug) { console.log(this); }
         throw new SyntaxError("Unexpected end of stream");
     }
 
+    log (node) {
+        console.log(node);
+        console.log(this.to_string(node));
+    }
+
     clone (name) {
@@ -356,0 +360,0 @@ name = name || this.name;

package.json

 {
     "name": "@jeefo/parser",
-    "version": "0.0.25",
-    "description": "A library for parsing AST for any language.",
+    "version": "0.0.26",
+    "description": "A library for parsing AST nodes. (under developing...)",
     "author": {
@@ -14,3 +14,2 @@ "name": "je3f0o",
     "scripts": {
-        "test": "./node_modules/mocha/bin/mocha \"specs/**/*_specs.js\"",
         "save": "git add . && git c \"`date`\" && git p",
@@ -17,0 +16,0 @@ "save_version": "git add . && git c \"v$npm_package_version\" && git p",

unexpected_token_exception.js

 /* -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
 * File Name   : unexpected_token_exception.js
 * Created at  : 2019-02-09
-* Updated at  : 2019-10-31
+* Updated at  : 2020-10-22
 * Author      : jeefo
@@ -85,4 +85,7 @@ * Purpose     :
 
-        const spaces   = ' '.repeat(parser.next_token.start.virtual_column - 1);
-        const pointers = '^'.repeat(parser.next_token.end.virtual_column - parser.next_token.start.virtual_column + 1);
+        const spaces_length = this.token.start.virtual_column - 1;
+        let hat_length = this.token.end.virtual_column - this.token.start.virtual_column + 1;
+        if (hat_length < 0) hat_length = 1;
+        const spaces   = ' '.repeat(spaces_length);
+        const pointers = '^'.repeat(hat_length);
 
@@ -89,0 +92,0 @@ const table = [

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

30835

increased by0.61%

Lines of code

788

increased by0.9%

No dependency changes