tree-sitter-abl 0.0.51 → 0.1.1

package/grammar.js

@@ -28,7 +28,8 @@ module.exports = grammar({
     $._def_keyword,
     $._var_keyword,
     $._index_keyword,
-    $._field_keyword
+    $._field_keyword,
+    $._return_keyword
   ],
   extras: ($) => [$.comment, /[\s\f\uFEFF\u2060\u200B]|\\\r?\n/],
   word: ($) => $.identifier,
@@ -43,10 +44,11 @@ module.exports = grammar({
     [$.size_phrase, $.frame_definition],
     [$.dataset_expression, $.object_access],
     [$.in_frame_phrase, $._expression],
+    [$.in_frame_phrase, $._message_statement_expression],
     [$.include, $.constant],
     [$.include_argument],
     [$.include_argument, $._constant_value],
-    [$._literal, $._expression]
+    [$._literal, $._expression],
   ],
 
   rules: {
@@ -55,7 +57,7 @@ module.exports = grammar({
     
     body: ($) => seq(":", repeat(choice($._statement, $._definition, $.do_block, prec(-1, $.annotation)))),
 
-    _statement_body: ($) => choice($.do_block, prec(2, $._statement)),
+    _statement_body: ($) => choice($.do_block, prec(2, $._statement), $.constant),
 
     dot_body: ($) => seq(choice(":", "."), repeat(choice($._statement, $._definition))),
 
@@ -155,11 +157,16 @@ module.exports = grammar({
 
     _name: ($) => choice($.identifier, $.qualified_name),
 
-    file_name: ($) => /[A-z-_|0-9|\/]+\.[ip]/i,
+    file_name: ($) => /[A-z-_|0-9|\/]+\.[ipwr]/i,
 
-    // TODO: FIX: Comments inside comments caused memory leak
+    // TODO: FIX
     comment: ($) =>
       choice(seq("//", /.*/), seq("/*", /[^*]*\*+([^/*][^*]*\*+)*/, "/")),
+    // Note: This was initial solution for comments inside comments. Does not work
+    //  choice(
+    //     seq("//", /.*/),
+    //     seq("/*", repeat(choice(/[^*]/, /\*+[^/*]/)), /\*+\//)
+    //   ),
 
     annotation: ($) =>
       seq(
@@ -376,6 +383,106 @@ module.exports = grammar({
         kw("SUB-TOTAL")
       ),
 
+    _message_tuning: ($) =>
+      choice(
+        $.message_color,
+        $._message_alert_box,
+        $.message_update,
+        $.message_pause,
+        kw("NO-ERROR")
+    ),
+
+    message_color: ($) =>
+      seq(
+        kw("COLOR"),
+        $.color_phrase
+      ),
+
+    color_phrase: ($) =>
+      choice(
+        kw("NORMAL"),
+        kw("INPUT"),
+        kw("MESSAGES"),
+        seq(
+          optional(
+            choice(
+              kw("BLINK-"),
+              kw("RVV-"),
+              kw("UNDERLINE-"),
+              kw("BRIGHT-")
+            )
+          ),
+          choice($.string_literal, $.identifier)
+        ),
+
+        seq(
+          kw("VALUE"),
+          "(", $._expression, 
+          ")")
+      ),
+    
+    _message_alert_box: ($) =>
+      seq(
+        kw("VIEW-AS"),
+        kw("ALERT-BOX"),
+        optional($.alert_box_type),
+        optional($.alert_box_buttons),
+        optional(seq(kw("TITLE"), choice($.string_literal, $.additive_expression)))
+      ),
+
+    alert_box_type: ($) =>
+      choice(
+        kw("MESSAGE"),
+        kw("INFORMATION"),
+        kw("INFO"),
+        kw("WARNING"),
+        kw("ERROR"),
+        kw("QUESTION")
+      ),
+
+    alert_box_buttons: ($) =>
+      seq(
+        kw("BUTTONS"),
+        choice(
+          kw("OK"),
+          kw("CANCEL"),
+          kw("OK-CANCEL"),
+          kw("YES-NO"),
+          kw("YES-NO-CANCEL"),
+          kw("OK-HELP"),
+          kw("YES-NO-HELP"),
+          $.identifier,
+          $.string_literal
+        )
+      ),
+
+    message_update: ($) =>
+      seq(
+        choice(
+          kw("UPDATE"),
+          kw("SET")
+        ),
+        $._name,
+        repeat(
+          choice(
+            seq(
+              choice(
+                kw("AS"),
+                kw("LIKE")),
+                $._type
+              ),
+              seq(
+                kw("FORMAT"),
+                $.string_literal
+              ),
+              kw("AUTO-RETURN")
+          )
+        ),
+      ),
+
+    message_pause:($) => kw("PAUSE"),
+    
+
     // button_tuning: ($) =>
     //   choice(
     //     seq(kw("AUTO-GO"), optional(kw("AUTO-ENDKEY"))),
@@ -470,8 +577,8 @@ module.exports = grammar({
         seq(kw("MAP"), $.identifier),
         seq(
           kw("CONVERT"),
-          optional(seq(kw("TARGET"), $.string_literal)),
-          optional(seq(kw("SOURCE"), $.string_literal))
+          optional(seq(kw("TARGET"), choice($.identifier, $.string_literal))),
+          optional(seq(kw("SOURCE"), choice($.identifier, $.string_literal)))
         ),
       ),
 
@@ -632,7 +739,7 @@ module.exports = grammar({
       seq($._name, $.generic_expression),
 
     return_type: ($) =>
-      seq(choice(kw("RETURNS"), kw("RETURN")), field("type", $._type)),
+      seq(choice(kw("RETURNS"), alias($._return_keyword, "RETURN")), field("type", $._type)),
 
     member_modifier: ($) => choice(kw("ABSTRACT"), kw("OVERRIDE"), kw("FINAL")),
 
@@ -645,7 +752,7 @@ module.exports = grammar({
       prec.right(
         1,
         seq(
-          field("array", choice($.identifier, $.object_access)),
+          field("array", choice($.identifier, $.qualified_name, $.object_access)),
           $.array_literal,
         )
       ),
@@ -672,7 +779,7 @@ module.exports = grammar({
           choice(
             $.ternary_expression,
             seq(
-              choice($._name, $.object_access),
+              choice($._name, $.object_access, $.member_access),
               optional($.type_tuning)
             ),
             seq(
@@ -692,7 +799,8 @@ module.exports = grammar({
             $.constant,
             $._binary_expression,
             $.unary_expression,
-            $.function_call
+            $.function_call,
+            $.boolean_literal
           ),
           repeat($.parameter_tuning)
         )
@@ -897,7 +1005,7 @@ module.exports = grammar({
         seq(kw("NEXT"), optional(field("label", $.identifier))),
         seq(kw("RETRY"), optional(field("label", $.identifier))),
         seq(
-          kw("RETURN"),
+          alias($._return_keyword, "RETURN"),
           $._return_action
         )
       ),
@@ -917,7 +1025,8 @@ module.exports = grammar({
       seq(
         $.assignment,
         kw("TO"),
-        choice($.function_call, $._integer_literal, $.identifier, $.object_access),
+        optional(choice(kw("BROWSE"), kw("SELECTION-LIST"), kw("LIST-BOX"))),
+        choice($.function_call, $._integer_literal, $._name, $.object_access, $.multiplicative_expression, $.additive_expression),
         optional(seq(kw("BY"), choice($._integer_literal, $.unary_expression)))
       ),
 
@@ -1515,7 +1624,7 @@ module.exports = grammar({
       seq(
         $._define,
         optional(
-          choice(alias($._input_keyword, "INPUT"), alias($._output_keyword, "OUTPUT"), kw("INPUT-OUTPUT"), kw("RETURN"))
+          choice(alias($._input_keyword, "INPUT"), alias($._output_keyword, "OUTPUT"), kw("INPUT-OUTPUT"), alias($._return_keyword, "RETURN"))
         ),
         choice(kw("PARAMETER"), kw("PARAM")),
         optional($._parameter_definition_option),
@@ -1665,6 +1774,27 @@ module.exports = grammar({
 
     // STATEMENTS
 
+    message_statement:($) =>
+      seq(
+        kw("MESSAGE"),
+        repeat1(
+          choice(
+            $._message_statement_expression,
+            seq(
+              kw("SKIP"),
+              optional(seq("(", $._integer_literal, ")"))
+            )
+          )
+        ),
+        repeat($._message_tuning),
+        optional(seq(
+          kw("IN"),
+          kw("WINDOW"),
+          $._name
+        )),
+        $._terminator
+    ),
+
     null_statement: ($) => seq($.object_access, $._terminator),
 
     using_statement: ($) =>
@@ -1742,7 +1872,7 @@ module.exports = grammar({
         $._block_terminator
       ),
 
-    variable_assignment: ($) => seq($.assignment, $._terminator),
+    variable_assignment: ($) => seq($.assignment, optional(kw("NO-ERROR")), $._terminator),
 
     assignment: ($) =>
       prec.right(
@@ -1799,7 +1929,7 @@ module.exports = grammar({
         repeat($._repeat_phrase),
         optional($.preselect_phrase),
         optional($.while_phrase),
-        optional($._on_phrase),
+        repeat($._on_phrase),
         $.body,
         $._block_terminator
       ),
@@ -1812,11 +1942,11 @@ module.exports = grammar({
       ),
 
     return_statement: ($) =>
-      seq(
-        kw("RETURN"),
+      prec(1, seq(
+        alias($._return_keyword, "RETURN"),
         optional($._return_action),
         $._terminator
-      ),
+      )),
 
     input_output_statement: ($) =>
       seq(
@@ -1828,8 +1958,8 @@ module.exports = grammar({
           ),
         ),
         $._input_output_option,
-        repeat($.stream_tuning),
         repeat($.stream_flag),
+        repeat($.stream_tuning),
         optional($.constant),
         $._terminator
       ),
@@ -1840,6 +1970,19 @@ module.exports = grammar({
         seq(
           choice(kw("FROM"), kw("TO")),
           choice($.string_literal, $.function_call)
+        ),
+        seq(
+          kw("THROUGH"),
+          choice($.identifier, seq(kw("VALUE"), "(", $._expression, ")")), 
+          repeat(
+            choice(
+            $.identifier,
+            $.string_literal,
+            $.number_literal,
+            seq(kw("VALUE"), "(", $._expression, ")")
+            )
+          ),
+          optional(seq(">", $.identifier)) 
         )
       ),
 
@@ -1848,7 +1991,7 @@ module.exports = grammar({
         optional($.label),
         alias($._for_keyword, "FOR"),
         _list($._for_phrase, ","),
-        repeat(choice($._on_phrase, $.frame_phrase)),
+        repeat(choice($._on_phrase, $.frame_phrase, $.while_phrase)),
         $.body,
         $._block_terminator
       ),
@@ -1978,8 +2121,9 @@ module.exports = grammar({
         kw("RUN"),
         field(
           "procedure",
-          choice($._name, $.function_call, $.file_name)
+          choice($._name, $.function_call, $.file_name, $.string_literal)
         ),
+        optional($.function_call_argument),
         repeat($.run_tuning),
         optional(alias($.function_arguments, $.arguments)),
         optional(kw("NO-ERROR")),
@@ -2000,7 +2144,7 @@ module.exports = grammar({
         optional($.label),
         kw("DO"),
         repeat($._do_tuning),
-        optional($._on_phrase),
+        repeat($._on_phrase),
         optional($.frame_phrase),
         $.body,
         $._block_terminator
@@ -2209,6 +2353,33 @@ module.exports = grammar({
         $._binary_expression
       ),
 
+  _message_statement_expression: ($) => 
+    choice(
+      $.unary_expression,
+      $.null_expression,
+      $.ternary_expression,
+      $.available_expression,
+      $.accumulate_expression,
+      $.parenthesized_expression,
+      $.ambiguous_expression,
+      $.current_changed_expression,
+      $.locked_expression,
+      $.can_find_expression,
+      $.additive_expression,
+      $.multiplicative_expression,
+      $.boolean_literal,
+      $.string_literal,
+      $.date_literal,
+      $.number_literal,
+      $.array_literal,
+      $.object_access,
+      $.member_access,
+      $.array_access,
+      $.function_call,
+      $._name,
+      $.constant
+    ),
+
     // SUPERTYPES
 
     _expression: ($) =>
@@ -2248,6 +2419,7 @@ module.exports = grammar({
     _statement: ($) =>
       choice(
         $.var_statement,
+        $.message_statement,
         $.null_statement,
         $.procedure_statement,
         $.function_statement,
@@ -2266,8 +2438,6 @@ module.exports = grammar({
         $.undo_statement,
         $.error_scope_statement,
         $.using_statement,
-        // $.class_statement,
-        // $.interface_statement,
         $.on_statement,
         $.prompt_for_statement,
         $.release_statement,
@@ -2275,10 +2445,7 @@ module.exports = grammar({
         $.enum_statement,
         $.abl_statement,
 
-        // $._definition,
-
         $.variable_assignment,
-        // $.do_block,
         $.preprocessor_directive,
         $.include,
         $.annotation //TODO: Check should it be in supertype

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-abl",
-  "version": "0.0.51",
+  "version": "0.1.1",
   "description": "ABL grammar for tree-sitter",
   "repository": "https://github.com/eglekaz/tree-sitter-abl",
   "keywords": [