tree-sitter-abl 0.0.49 → 0.0.50

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "AblFormatter.variableAssignmentFormatting": true
+}

package/binding.gyp

@@ -1,19 +1,19 @@
-{
-  "targets": [
-    {
-      "target_name": "tree_sitter_abl_binding",
-      "include_dirs": [
-        "<!(node -e \"require('nan')\")",
-        "src"
-      ],
-      "sources": [
-        "bindings/node/binding.cc",
-        "src/parser.c",
-        "src/scanner.c",
-      ],
-      "cflags_c": [
-        "-std=c99",
-      ]
-    }
-  ]
-}
+{
+  "targets": [
+    {
+      "target_name": "tree_sitter_abl_binding",
+      "include_dirs": [
+        "<!(node -e \"require('nan')\")",
+        "src"
+      ],
+      "sources": [
+        "bindings/node/binding.cc",
+        "src/parser.c",
+        "src/scanner.c",
+      ],
+      "cflags_c": [
+        "-std=c99",
+      ]
+    }
+  ]
+}

package/bindings/node/binding.cc

@@ -25,4 +25,4 @@ void Init(Local<Object> exports, Local<Object> module) {
 
 NODE_MODULE(tree_sitter_abl_binding, Init)
 
-}  // namespace
+}  // namespace

package/bindings/node/index.js

@@ -16,4 +16,4 @@ try {
 
 try {
   module.exports.nodeTypeInfo = require("../../src/node-types.json");
-} catch (_) {}
+} catch (_) {}

package/bindings/rust/build.rs

@@ -1,40 +1,40 @@
-fn main() {
-    let src_dir = std::path::Path::new("src");
-
-    let mut c_config = cc::Build::new();
-    c_config.include(&src_dir);
-    c_config
-        .flag_if_supported("-Wno-unused-parameter")
-        .flag_if_supported("-Wno-unused-but-set-variable")
-        .flag_if_supported("-Wno-trigraphs");
-    let parser_path = src_dir.join("parser.c");
-    c_config.file(&parser_path);
-
-    // If your language uses an external scanner written in C,
-    // then include this block of code:
-
-    /*
-    let scanner_path = src_dir.join("scanner.c");
-    c_config.file(&scanner_path);
-    println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
-    */
-
-    c_config.compile("parser");
-    println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
-
-    // If your language uses an external scanner written in C++,
-    // then include this block of code:
-
-    /*
-    let mut cpp_config = cc::Build::new();
-    cpp_config.cpp(true);
-    cpp_config.include(&src_dir);
-    cpp_config
-        .flag_if_supported("-Wno-unused-parameter")
-        .flag_if_supported("-Wno-unused-but-set-variable");
-    let scanner_path = src_dir.join("scanner.cc");
-    cpp_config.file(&scanner_path);
-    cpp_config.compile("scanner");
-    println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
-    */
-}
+fn main() {
+    let src_dir = std::path::Path::new("src");
+
+    let mut c_config = cc::Build::new();
+    c_config.include(&src_dir);
+    c_config
+        .flag_if_supported("-Wno-unused-parameter")
+        .flag_if_supported("-Wno-unused-but-set-variable")
+        .flag_if_supported("-Wno-trigraphs");
+    let parser_path = src_dir.join("parser.c");
+    c_config.file(&parser_path);
+
+    // If your language uses an external scanner written in C,
+    // then include this block of code:
+
+    /*
+    let scanner_path = src_dir.join("scanner.c");
+    c_config.file(&scanner_path);
+    println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
+    */
+
+    c_config.compile("parser");
+    println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
+
+    // If your language uses an external scanner written in C++,
+    // then include this block of code:
+
+    /*
+    let mut cpp_config = cc::Build::new();
+    cpp_config.cpp(true);
+    cpp_config.include(&src_dir);
+    cpp_config
+        .flag_if_supported("-Wno-unused-parameter")
+        .flag_if_supported("-Wno-unused-but-set-variable");
+    let scanner_path = src_dir.join("scanner.cc");
+    cpp_config.file(&scanner_path);
+    cpp_config.compile("scanner");
+    println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
+    */
+}

package/bindings/rust/lib.rs

@@ -1,52 +1,52 @@
-//! This crate provides abl language support for the [tree-sitter][] parsing library.
-//!
-//! Typically, you will use the [language][language func] function to add this language to a
-//! tree-sitter [Parser][], and then use the parser to parse some code:
-//!
-//! ```
-//! let code = "";
-//! let mut parser = tree_sitter::Parser::new();
-//! parser.set_language(tree_sitter_abl::language()).expect("Error loading abl grammar");
-//! let tree = parser.parse(code, None).unwrap();
-//! ```
-//!
-//! [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
-//! [language func]: fn.language.html
-//! [Parser]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Parser.html
-//! [tree-sitter]: https://tree-sitter.github.io/
-
-use tree_sitter::Language;
-
-extern "C" {
-    fn tree_sitter_abl() -> Language;
-}
-
-/// Get the tree-sitter [Language][] for this grammar.
-///
-/// [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
-pub fn language() -> Language {
-    unsafe { tree_sitter_abl() }
-}
-
-/// The content of the [`node-types.json`][] file for this grammar.
-///
-/// [`node-types.json`]: https://tree-sitter.github.io/tree-sitter/using-parsers#static-node-types
-pub const NODE_TYPES: &'static str = include_str!("../../src/node-types.json");
-
-// Uncomment these to include any queries that this grammar contains
-
-// pub const HIGHLIGHTS_QUERY: &'static str = include_str!("../../queries/highlights.scm");
-// pub const INJECTIONS_QUERY: &'static str = include_str!("../../queries/injections.scm");
-// pub const LOCALS_QUERY: &'static str = include_str!("../../queries/locals.scm");
-// pub const TAGS_QUERY: &'static str = include_str!("../../queries/tags.scm");
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn test_can_load_grammar() {
-        let mut parser = tree_sitter::Parser::new();
-        parser
-            .set_language(super::language())
-            .expect("Error loading abl language");
-    }
-}
+//! This crate provides abl language support for the [tree-sitter][] parsing library.
+//!
+//! Typically, you will use the [language][language func] function to add this language to a
+//! tree-sitter [Parser][], and then use the parser to parse some code:
+//!
+//! ```
+//! let code = "";
+//! let mut parser = tree_sitter::Parser::new();
+//! parser.set_language(tree_sitter_abl::language()).expect("Error loading abl grammar");
+//! let tree = parser.parse(code, None).unwrap();
+//! ```
+//!
+//! [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
+//! [language func]: fn.language.html
+//! [Parser]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Parser.html
+//! [tree-sitter]: https://tree-sitter.github.io/
+
+use tree_sitter::Language;
+
+extern "C" {
+    fn tree_sitter_abl() -> Language;
+}
+
+/// Get the tree-sitter [Language][] for this grammar.
+///
+/// [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
+pub fn language() -> Language {
+    unsafe { tree_sitter_abl() }
+}
+
+/// The content of the [`node-types.json`][] file for this grammar.
+///
+/// [`node-types.json`]: https://tree-sitter.github.io/tree-sitter/using-parsers#static-node-types
+pub const NODE_TYPES: &'static str = include_str!("../../src/node-types.json");
+
+// Uncomment these to include any queries that this grammar contains
+
+// pub const HIGHLIGHTS_QUERY: &'static str = include_str!("../../queries/highlights.scm");
+// pub const INJECTIONS_QUERY: &'static str = include_str!("../../queries/injections.scm");
+// pub const LOCALS_QUERY: &'static str = include_str!("../../queries/locals.scm");
+// pub const TAGS_QUERY: &'static str = include_str!("../../queries/tags.scm");
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_can_load_grammar() {
+        let mut parser = tree_sitter::Parser::new();
+        parser
+            .set_language(super::language())
+            .expect("Error loading abl language");
+    }
+}

package/example1.cls

@@ -1,32 +1 @@
-/* formatterSettingsOverride */
-/*  { "abl.completion.upperCase": true}*/
-
-CLASS A:
-  DEFINE PROTECTED VARIABLE oRepo AS ILanguageRepository NO-UNDO.
-
-  CONSTRUCTOR PUBLIC LanguageService (poRepo AS ILanguageRepository):
-    THIS-OBJECT:oRepo = poRepo.
-  END CONSTRUCTOR.
-
-  METHOD PUBLIC Language GetByID(pcID AS CHARACTER):
-    RETURN THIS-OBJECT:oRepo:GetByID(pcID).
-  END METHOD.
-
-  METHOD PUBLIC Language GetByISO(pcISO AS CHARACTER):
-    RETURN THIS-OBJECT:oRepo:GetByISO(pcISO).
-  END METHOD.
-
-  METHOD PUBLIC LOGICAL ExistByISO(pcISO AS CHARACTER):
-    THIS-OBJECT:oRepo:GetByISO(pcISO).
-    RETURN TRUE.
-
-    CATCH e AS LanguageError:
-      RETURN FALSE.
-    END.
-  END METHOD.
-
-  METHOD PUBLIC Language GetByNameEn(pcNameEn AS CHARACTER):
-    RETURN THIS-OBJECT:oRepo:GetByNameEn(pcNameEn).
-  END METHOD.
-
-END CLASS.
+run getValues.p(input Session:List [{&value}], output table ttData append by-reference).

package/grammar.js

@@ -42,7 +42,7 @@ module.exports = grammar({
   rules: {
     source_code: ($) => repeat(choice($._statement, $.class_statement, $._definition, $.do_block, $.interface_statement)),
 
-    body: ($) => seq(":", repeat(choice($._statement, $._definition))),
+    body: ($) => seq(":", repeat(choice($._statement, $._definition, $.do_block))),
 
     _statement_body: ($) => choice($.do_block, prec(2, $._statement)),
 
@@ -57,9 +57,11 @@ module.exports = grammar({
             $.var_statement,
             seq(
               optional($.annotation),
-              $.method_statement),
+              $.method_statement
+            ),
             $.constructor_statement,
-            $.destructor_statement
+            $.destructor_statement,
+            $.function_statement
           )
         )
       ),
@@ -242,6 +244,7 @@ module.exports = grammar({
         $.array_literal,
         $.array_access,
         $.identifier,
+        $.constant,
         $._binary_expression
       ),
 
@@ -283,7 +286,7 @@ module.exports = grammar({
 
     // IDENTIFIERS
 
-    identifier: ($) => /[A-Z|a-z|\-|\\_]{1}[A-Z|a-z|\-|\\_|0-9]*/i,
+    identifier: ($) => /[A-Z|a-z|\-|\\_]{1}[#A-Z|a-z|\-|\\_|0-9]*/i,
 
     constant: ($) =>
       seq("{", optional("&"), $._constant_value, "}"),
@@ -302,7 +305,8 @@ module.exports = grammar({
       choice(
         $.access_tuning,
         $.scope_tuning,
-        $.member_modifier
+        $.member_modifier,
+        $.constant
       ),
 
     // TODO: Fix! HACK: progress spaghetti allows to define tuning order before where clause
@@ -533,23 +537,21 @@ module.exports = grammar({
       ),
 
     variable_tuning: ($) =>
-      seq(
-        choice(
-          $._serialize_name,
-          // $._bgcolor,
-          // $._fgcolor,
-          // $._pfcolor,
-          // $._dcolor,
-          // $._context_help_id,
-          $._value_tuning,
-          $._format,
-          $._font,
-          $._label,
-          seq(kw("MOUSE-POINTER"), $.identifier),
-          $._column_label,
-          // kw("DROP-TARGET"),
-          seq(optional(kw("NOT")), kw("CASE-SENSITIVE")),
-        )
+      choice(
+        $._serialize_name,
+        // $._bgcolor,
+        // $._fgcolor,
+        // $._pfcolor,
+        // $._dcolor,
+        // $._context_help_id,
+        $._value_tuning,
+        $._format,
+        $._font,
+        $._label,
+        seq(kw("MOUSE-POINTER"), $.identifier),
+        $._column_label,
+        // kw("DROP-TARGET"),
+        seq(optional(kw("NOT")), kw("CASE-SENSITIVE")),
       ),
 
     // TYPES
@@ -649,9 +651,10 @@ module.exports = grammar({
             $.number_literal,
             $.null_expression,
             $._binary_expression,
-
+            $.unary_expression,
+            $.function_call
           ),
-          optional($.parameter_tuning)
+          repeat($.parameter_tuning)
         )
       ),
 
@@ -726,7 +729,7 @@ module.exports = grammar({
       seq(
         field(
           "object",
-          choice($.identifier, $.new_expression, $.function_call)
+          choice($.new_expression, $.function_call, $.constant, $._name)
         ),
         repeat1(seq(alias($._namecolon, ":"), field("property", $.identifier)))
       ),
@@ -740,7 +743,7 @@ module.exports = grammar({
       ),
 
     case_condition: ($) =>
-      seq(optional(seq(kw("OR"), kw("WHEN"))), choice($._literal, $.boolean_literal)),
+      seq(optional(seq(kw("OR"), kw("WHEN"))), choice($._literal, $.boolean_literal, $.logical_expression, $.comparison_expression, $.unary_expression, $.object_access)),
 
     case_when_branch: ($) =>
       seq(kw("WHEN"), repeat1($.case_condition), kw("THEN"), $._statement_body),
@@ -854,9 +857,9 @@ module.exports = grammar({
 
     _return_action: ($) =>
       choice(
-        seq(kw("ERROR"), optional($.identifier)),
+        seq(kw("ERROR"), optional($._return_value_expression)),
         kw("NO-APPLY"),
-        $._expression
+        $._return_value_expression
       ),
 
     // PHRASES
@@ -867,8 +870,8 @@ module.exports = grammar({
       seq(
         $.assignment,
         kw("TO"),
-        choice($.function_call, $._integer_literal, $.identifier),
-        optional(seq(kw("BY"), $._integer_literal))
+        choice($.function_call, $._integer_literal, $.identifier, $.object_access),
+        optional(seq(kw("BY"), choice($._integer_literal, $.unary_expression)))
       ),
 
     // combo_box_phrase: ($) =>
@@ -1118,6 +1121,13 @@ module.exports = grammar({
         _list($._name, ",")
       ),
 
+    in_frame_phrase: ($) =>
+    seq(
+        $.object_access,
+        kw("IN"),
+        $._frame
+    ),
+
       // widget_phrase: ($) =>
       //   choice(
       //     $._frame,
@@ -1386,13 +1396,16 @@ module.exports = grammar({
 
     event_definition: ($) =>
       seq(
-        $._define,
-        repeat($._tuning),
-        kw("EVENT"),
-        $.identifier,
-        optional(kw("SIGNATURE")),
-        kw("VOID"),
-        alias($.function_parameters, $.parameters),
+      $._define,
+      repeat($._tuning),
+      kw("EVENT"),
+      field("name", $.identifier),
+        optional(
+            choice(
+              seq(optional(kw("SIGNATURE")), kw("VOID"), alias($.function_parameters, $.parameters)),
+              seq(optional(kw("DELEGATE")), optional(kw("CLASS")), $._name),
+          )
+        ),
         $._terminator
       ),
 
@@ -1432,7 +1445,9 @@ module.exports = grammar({
         optional(
           choice(alias($._input_keyword, "INPUT"), alias($._output_keyword, "OUTPUT"), kw("INPUT-OUTPUT"), kw("RETURN"))
         ),
-        $._parameter_definition_option,
+        choice(kw("PARAMETER"), kw("PARAM")),
+        optional($._parameter_definition_option),
+        optional(alias($._for_keyword, "FOR")),
         field("name", $.identifier),
         choice(
           seq($.type_tuning, repeat($.variable_tuning)),
@@ -1450,17 +1465,11 @@ module.exports = grammar({
       ),
 
     _parameter_definition_option: ($) =>
-      seq(
-        choice(kw("PARAMETER"), kw("PARAM")),
-        optional(
-          choice(
-            seq(kw("BUFFER"), field("buffer", $.identifier)),
-            kw("TABLE"),
-            kw("TABLE-HANDLE"),
-            seq(kw("DATASET"), optional(token.immediate(kw("-HANDLE"))))
-          )
-        ),
-        optional(alias($._for_keyword, "FOR")),
+      choice(
+        seq(kw("BUFFER"), field("buffer", $.identifier)),
+        kw("TABLE"),
+        kw("TABLE-HANDLE"),
+        seq(kw("DATASET"), optional(token.immediate(kw("-HANDLE"))))
       ),
 
     property_definition: ($) =>
@@ -1471,7 +1480,7 @@ module.exports = grammar({
         field("name", $.identifier),
         $.type_tuning,
         repeat($._value_tuning),
-        choice(seq($.getter, $.setter), $._terminator)
+        choice(repeat1(choice($.getter, $.setter)), $._terminator)
       ),
 
     query_definition: ($) =>
@@ -1652,8 +1661,18 @@ module.exports = grammar({
         $.return_type,
         optional($._extent),
         optional(alias($.function_parameters, $.parameters)),
-        optional(alias($.dot_body, $.body)),
-        $._block_terminator
+        $._function_option,
+      ),
+
+    _function_option: ($) =>
+      choice(
+        seq(
+          optional(alias($.dot_body, $.body)),
+          $._block_terminator),
+          seq(
+            choice(seq(kw("IN"), $.identifier), kw("FORWARD")),
+            $._terminator
+          )
       ),
 
     repeat_statement: ($) =>
@@ -1693,6 +1712,7 @@ module.exports = grammar({
         $._input_output_option,
         repeat($.stream_tuning),
         repeat($.stream_flag),
+        optional($.constant),
         $._terminator
       ),
 
@@ -1827,6 +1847,14 @@ module.exports = grammar({
         $._terminator
       ),
 
+    release_statement: ($) =>
+      seq(
+        kw("RELEASE"),
+        $.identifier,
+        optional(kw("NO-ERROR")),
+        $._terminator
+      ),
+
     run_statement: ($) =>
       seq(
         kw("RUN"),
@@ -1939,13 +1967,22 @@ module.exports = grammar({
     ambiguous_expression: ($) => seq(kw("AMBIGUOUS"), $._name),
 
     temp_table_expression: ($) =>
-      seq(kw("TEMP-TABLE"), field("table", $.identifier)),
+      seq(kw("TEMP-TABLE"), field("table", choice($.identifier, $.object_access))),
+
+    query_expression: ($) =>
+      seq(kw("QUERY"), field("query", choice($.identifier, $.object_access))),
+
+    stream_expression: ($) =>
+      seq(kw("STREAM"), field("stream", choice($.identifier, $.object_access))),
+
+    buffer_expression: ($) =>
+      seq(kw("BUFFER"), field("buffer", choice($.identifier, $.object_access))),
 
     current_changed_expression: ($) => seq(kw("CURRENT-CHANGED"), $._name),
 
     locked_expression: ($) => seq(kw("LOCKED"), $._name),
 
-    // dataset_expression: ($) => seq(prec.left(kw("DATASET")), $._name),
+    dataset_expression: ($) => seq(prec.left(kw("DATASET")), $._name),
 
     when_expression: ($) => seq(kw("WHEN"), $._expression),
 
@@ -2005,7 +2042,7 @@ module.exports = grammar({
     available_expression: ($) =>
       seq(
         choice(kw("AVAIL"), kw("AVAILABLE")),
-        $.identifier
+        choice($.identifier, $.parenthesized_expression),
       ),
 
     new_expression: ($) =>
@@ -2030,6 +2067,30 @@ module.exports = grammar({
         )
       ),
 
+    _return_value_expression: ($) =>
+      choice(
+        $.string_literal,
+        $.number_literal,
+        $.boolean_literal,
+        $.null_expression,
+        $.dataset_expression,
+        $.temp_table_expression,
+        $.query_expression,
+        $.stream_expression,
+        $.buffer_expression,
+        $.identifier,
+        $.function_call,
+        $.object_access,
+        $.member_access,
+        $.qualified_name,
+        $.array_access,
+        $.ternary_expression,
+        $.new_expression,
+        $.parenthesized_expression,
+        $.unary_expression,
+        $._binary_expression
+      ),
+
     // SUPERTYPES
 
     _expression: ($) =>
@@ -2045,7 +2106,7 @@ module.exports = grammar({
         $.temp_table_expression,
         $.current_changed_expression,
         $.locked_expression,
-        // $.dataset_expression,
+        $.dataset_expression,
         $.input_expression,
         $.can_find_expression,
         $.new_expression,
@@ -2060,6 +2121,7 @@ module.exports = grammar({
         $.member_access,
         $.array_access,
         $.function_call,
+        $.in_frame_phrase,
 
         $._name,
         $.constant
@@ -2090,6 +2152,7 @@ module.exports = grammar({
         // $.interface_statement,
         $.on_statement,
         $.prompt_for_statement,
+        $.release_statement,
         $.run_statement,
         $.enum_statement,
         $.abl_statement,

package/package.json

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