tree-sitter-abl 0.1.0 → 0.1.2

package/grammar.js

@@ -48,13 +48,14 @@ module.exports = grammar({
     [$.include, $.constant],
     [$.include_argument],
     [$.include_argument, $._constant_value],
-    [$._literal, $._expression]
+    [$._literal, $._expression],
+    [$._update_space_skip]
   ],
 
   rules: {
     source_code: ($) => repeat(choice($._statement, $.class_statement, $._definition, $.do_block, $.interface_statement, $.method_statement, $.constant)),
 
-    
+
     body: ($) => seq(":", repeat(choice($._statement, $._definition, $.do_block, prec(-1, $.annotation)))),
 
     _statement_body: ($) => choice($.do_block, prec(2, $._statement), $.constant),
@@ -161,7 +162,7 @@ module.exports = grammar({
 
     // TODO: FIX
     comment: ($) =>
-      choice(seq("//", /.*/), seq("/*", /[^*]*\*+([^/*][^*]*\*+)*/, "/")),
+      choice(seq("//", /[^\r\n]*/), seq("/*", /[^*]*\*+([^/*][^*]*\*+)*/, "/")),
     // Note: This was initial solution for comments inside comments. Does not work
     //  choice(
     //     seq("//", /.*/),
@@ -317,7 +318,7 @@ module.exports = grammar({
 
     include_file_path: ($) =>
       prec.right(repeat1(choice(
-        $.constant, 
+        $.constant,
         /[A-z-_|0-9|\/\.]+/i
       ))),
 
@@ -334,7 +335,7 @@ module.exports = grammar({
       seq("{", optional("&"), $._constant_value, "}"),
 
     _constant_value: ($) => choice(
-      $.identifier, 
+      $.identifier,
       $._integer_literal,
       seq($.identifier, "=", choice($.identifier, $._integer_literal, $.string_literal)),
       seq($.identifier, repeat1(choice(/[\s\-()a-zA-Z0-9]+/)))
@@ -417,10 +418,10 @@ module.exports = grammar({
 
         seq(
           kw("VALUE"),
-          "(", $._expression, 
+          "(", $._expression,
           ")")
       ),
-    
+
     _message_alert_box: ($) =>
       seq(
         kw("VIEW-AS"),
@@ -481,7 +482,46 @@ module.exports = grammar({
       ),
 
     message_pause:($) => kw("PAUSE"),
-    
+
+    update_tuning: ($) => choice(
+      $.comparison_expression,
+      $._update_field,
+      $._update_text,
+      $._update_constant,
+      "^",
+      $._update_space_skip
+    ),
+
+  _update_field: ($) =>
+    seq(
+      $._name,
+      optional($._format),
+      optional($.when_expression)
+    ),
+
+  _update_text: ($) =>
+    seq(
+      kw("TEXT"),
+      "(",
+        _list(seq($._name, optional($._format)), ","),
+      ")"
+    ),
+  _update_constant: ($) =>
+    seq(
+      $.constant,
+      optional(
+        choice(
+          seq(kw("AT"), $._expression),
+          seq(kw("TO"), $._expression)
+        )
+      )
+    ),
+
+  _update_space_skip: ($) =>
+    seq(
+      choice(kw("SPACE"), kw("SKIP")),
+      optional(seq("(", $._integer_literal, ")"))
+    ),
 
     // button_tuning: ($) =>
     //   choice(
@@ -577,8 +617,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)))
         ),
       ),
 
@@ -923,15 +963,18 @@ module.exports = grammar({
         alias($._index_keyword, "INDEX"),
         $.identifier,
         repeat($.index_tuning),
-        repeat(seq(field("field", $.identifier), optional($.sort_order)))
+        repeat($.index_field)
       ),
 
+    index_field: ($) =>
+      seq(field("field", $.identifier), optional($.sort_order)),
+
     variable: ($) => choice(field("name", $.identifier), $.assignment),
 
     enum_member: ($) =>
       prec.right(
       seq(
-        repeat($.annotation), 
+        repeat($.annotation),
         field("name", $.identifier),
         field(
           "value",
@@ -942,7 +985,7 @@ module.exports = grammar({
             )
           )
         ),
-        repeat($.annotation), 
+        repeat($.annotation),
       )
     ),
 
@@ -1025,7 +1068,8 @@ module.exports = grammar({
       seq(
         $.assignment,
         kw("TO"),
-        choice($.function_call, $._integer_literal, $._name, $.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)))
       ),
 
@@ -1071,13 +1115,13 @@ module.exports = grammar({
         optional(choice(seq(kw("HORIZONTAL"), optional(kw("EXPAND"))), kw("VERTICAL"))),
         seq(
           kw("RADIO-BUTTONS"),
-          field("label", choice($.string_literal, $.identifier)), 
-          ",", 
+          field("label", choice($.string_literal, $.identifier)),
+          ",",
           field("value", choice($.string_literal, $.identifier, $._expression)),
           repeat(seq(
-            ",", 
-            field("label", choice($.string_literal, $.identifier)), 
-            ",", 
+            ",",
+            field("label", choice($.string_literal, $.identifier)),
+            ",",
             field("value", choice($.string_literal, $.identifier, $._expression))
           ))
         ),
@@ -1871,7 +1915,7 @@ module.exports = grammar({
         $._block_terminator
       ),
 
-    variable_assignment: ($) => seq($.assignment, $._terminator),
+    variable_assignment: ($) => seq($.assignment, optional(kw("NO-ERROR")), $._terminator),
 
     assignment: ($) =>
       prec.right(
@@ -1894,7 +1938,7 @@ module.exports = grammar({
           $.assignment_operator,
           prec.right(choice($._expression, $.include)),
           optional($.when_expression),
-          optional(seq(kw("IN"), $._frame))
+          optional(seq(token.immediate(kw("IN")), $._frame)),
         )
       ),
 
@@ -1928,7 +1972,7 @@ module.exports = grammar({
         repeat($._repeat_phrase),
         optional($.preselect_phrase),
         optional($.while_phrase),
-        optional($._on_phrase),
+        repeat($._on_phrase),
         $.body,
         $._block_terminator
       ),
@@ -1941,11 +1985,11 @@ module.exports = grammar({
       ),
 
     return_statement: ($) =>
-      seq(
+      prec(1, seq(
         alias($._return_keyword, "RETURN"),
         optional($._return_action),
         $._terminator
-      ),
+      )),
 
     input_output_statement: ($) =>
       seq(
@@ -1957,8 +2001,8 @@ module.exports = grammar({
           ),
         ),
         $._input_output_option,
-        repeat($.stream_tuning),
         repeat($.stream_flag),
+        repeat($.stream_tuning),
         optional($.constant),
         $._terminator
       ),
@@ -1969,6 +2013,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))
         )
       ),
 
@@ -2109,6 +2166,7 @@ module.exports = grammar({
           "procedure",
           choice($._name, $.function_call, $.file_name, $.string_literal)
         ),
+        optional($.function_call_argument),
         repeat($.run_tuning),
         optional(alias($.function_arguments, $.arguments)),
         optional(kw("NO-ERROR")),
@@ -2129,7 +2187,7 @@ module.exports = grammar({
         optional($.label),
         kw("DO"),
         repeat($._do_tuning),
-        optional($._on_phrase),
+        repeat($._on_phrase),
         optional($.frame_phrase),
         $.body,
         $._block_terminator
@@ -2169,6 +2227,33 @@ module.exports = grammar({
         )
       ),
 
+    update_statement: ($) => seq(
+      kw("UPDATE"),
+      optional(kw("UNLESS-HIDDEN")),
+      repeat($.update_tuning),
+      optional($.go_on_clause),
+      optional($.frame_phrase),
+      optional(kw("NO-ERROR")),
+      $._terminator
+    ),
+
+  go_on_clause: ($) =>
+    seq(
+      kw("GO-ON"),
+      "(",
+      _list($.identifier, ","),
+      ")"
+    ),
+
+  editing_phrase: ($) =>
+    seq(
+      optional(seq($.identifier, ":")),
+      kw("EDITING"),
+      ":",
+      repeat(choice($._statement, $._definition)),
+      kw("END")
+    ),
+
     // EXPRESSIONS
 
     null_expression: ($) => /\?/,
@@ -2338,7 +2423,7 @@ module.exports = grammar({
         $._binary_expression
       ),
 
-  _message_statement_expression: ($) => 
+  _message_statement_expression: ($) =>
     choice(
       $.unary_expression,
       $.null_expression,
@@ -2428,6 +2513,7 @@ module.exports = grammar({
         $.release_statement,
         $.run_statement,
         $.enum_statement,
+        $.update_statement,
         $.abl_statement,
 
         $.variable_assignment,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-abl",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "ABL grammar for tree-sitter",
   "repository": "https://github.com/eglekaz/tree-sitter-abl",
   "keywords": [
@@ -10,7 +10,6 @@
     "abl"
   ],
   "main": "bindings/node",
-
   "scripts": {
     "generate": "tree-sitter generate",
     "build": "tree-sitter generate && node-gyp build",