diff --git a/main.js b/main.js index edeb909..66237b1 100644 --- a/main.js +++ b/main.js @@ -53,7 +53,7 @@ var post_process_parser = function () { if(args["t"] !== undefined) { switch (args["t"]) { case "web": - out_js = "(function(){\n" + out_js + "return Lexer; \n})()"; + out_js = "(function(){\n" + out_js + "return LemonJS; \n})()"; break; case "node": out_js += "\n\n module.exports = LemonJS;"; diff --git a/parsers/filters/parser.y b/parsers/filters/parser.y index f54449f..159a920 100644 --- a/parsers/filters/parser.y +++ b/parsers/filters/parser.y @@ -2,8 +2,8 @@ %token_prefix TOKEN_ -%left OR. %left AND. +%left OR. %right NOT. %include { diff --git a/test.js b/test.js index 21d8fe0..d9ec34c 100644 --- a/test.js +++ b/test.js @@ -56,6 +56,10 @@ var test = function() { var test_time = LemonJS('add == Time [29/12/2019 15:01:24 441000]').tree; fs.writeFileSync("tests/test_time.json", JSON.stringify(test_time, true, 3)); + + var test_exp_1 = LemonJS('(add == Time [29/12/2019 15:01:24 441000]) and ddds == "sdfasdf" or a == 123 and v == 155').tree; + fs.writeFileSync("tests/test_exp_1.json", JSON.stringify(test_exp_1, true, 3)); + };