Add index expressions

corpus/expressions.txt

@@ -55,6 +55,27 @@ or = x \/ y;
   (assignment_item (identifier) (binary_operation (identifier) (identifier)))
   (assignment_item (identifier) (binary_operation (identifier) (identifier))))
 
+================
+Index Expression
+================
+
+named_colection = my_collection[1];
+named_accessor = my_collection[i];
+literal_collection = [1,2,3][i];
+multiple_accessor = my_collection[i,2];
+expression_accessor = my_collection[-i + 2];
+slice = my_collection[1..2];
+
+---
+
+(source_file
+  (assignment_item (identifier) (index_expression (identifier) (integer_literal)))
+  (assignment_item (identifier) (index_expression (identifier) (identifier)))
+  (assignment_item (identifier) (index_expression (array_literal (integer_literal) (integer_literal) (integer_literal)) (identifier)))
+  (assignment_item (identifier) (index_expression (identifier) (identifier) (integer_literal)))
+  (assignment_item (identifier) (index_expression (identifier) (binary_operation (unary_operation (identifier)) (integer_literal))))
+  (assignment_item (identifier) (index_expression (identifier) (binary_operation (integer_literal) (integer_literal)))))
+
 ==============
 Unary Operator
 ==============

grammar.js

@@ -1,5 +1,7 @@
 const PREC = {
-  annotation: 13,
+  call: 15,
+  annotation: 14,
+  unary: 13,
   exponent: 12,
   multiplicative: 11,
   additive: 10,
@@ -40,8 +42,10 @@ module.exports = grammar({
     _expression: $ => choice(
       $.identifier,
       $._literal,
-      $.unary_operation,
+
       $.binary_operation,
+      $.index_expression,
+      $.unary_operation,
       // TODO: Other expression types
     ),
 
@@ -73,10 +77,17 @@ module.exports = grammar({
       ))));
     },
 
-    unary_operation: $ => seq(
+    index_expression: $ => prec(PREC.call, seq(
+      field('collection', $._expression),
+      '[',
+      field('indices', seq($._expression, repeat(seq(',', $._expression)))),
+      ']',
+    )),
+
+    unary_operation: $ => prec(PREC.unary, seq(
       field('operator', choice('-', 'not', '¬')),
       $._expression
-    ),
+    )),
 
     _literal: $ => choice(
       $.absent,

src/binding.cc

@@ -4,7 +4,7 @@
 
 using namespace v8;
 
-extern "C" TSLanguage * tree_sitter_MiniZinc();
+extern "C" TSLanguage * tree_sitter_minizinc();
 
 namespace {
 
@@ -17,12 +17,12 @@ void Init(Local<Object> exports, Local<Object> module) {
 
   Local<Function> constructor = Nan::GetFunction(tpl).ToLocalChecked();
   Local<Object> instance = constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
-  Nan::SetInternalFieldPointer(instance, 0, tree_sitter_MiniZinc());
+  Nan::SetInternalFieldPointer(instance, 0, tree_sitter_minizinc());
 
-  Nan::Set(instance, Nan::New("name").ToLocalChecked(), Nan::New("MiniZinc").ToLocalChecked());
+  Nan::Set(instance, Nan::New("name").ToLocalChecked(), Nan::New("minizinc").ToLocalChecked());
   Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance);
 }
 
-NODE_MODULE(tree_sitter_MiniZinc_binding, Init)
+NODE_MODULE(tree_sitter_minizinc_binding, Init)
 
 }  // namespace

src/grammar.json

@@ -99,14 +99,72 @@
         },
         {
           "type": "SYMBOL",
-          "name": "unary_operation"
+          "name": "binary_operation"
         },
         {
           "type": "SYMBOL",
-          "name": "binary_operation"
+          "name": "index_expression"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "unary_operation"
         }
       ]
     },
+    "index_expression": {
+      "type": "PREC",
+      "value": 15,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "FIELD",
+            "name": "collection",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_expression"
+            }
+          },
+          {
+            "type": "STRING",
+            "value": "["
+          },
+          {
+            "type": "FIELD",
+            "name": "indices",
+            "content": {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_expression"
+                },
+                {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": ","
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "_expression"
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "type": "STRING",
+            "value": "]"
+          }
+        ]
+      }
+    },
     "binary_operation": {
       "type": "CHOICE",
       "members": [
@@ -654,7 +712,7 @@
         },
         {
           "type": "PREC_LEFT",
-          "value": 13,
+          "value": 14,
           "content": {
             "type": "SEQ",
             "members": [
@@ -688,34 +746,38 @@
       ]
     },
     "unary_operation": {
-      "type": "SEQ",
+      "type": "PREC",
-      "members": [
+      "value": 13,
-        {
+      "content": {
-          "type": "FIELD",
+        "type": "SEQ",
-          "name": "operator",
+        "members": [
-          "content": {
+          {
-            "type": "CHOICE",
+            "type": "FIELD",
-            "members": [
+            "name": "operator",
-              {
+            "content": {
-                "type": "STRING",
+              "type": "CHOICE",
-                "value": "-"
+              "members": [
-              },
+                {
-              {
+                  "type": "STRING",
-                "type": "STRING",
+                  "value": "-"
-                "value": "not"
+                },
-              },
+                {
-              {
+                  "type": "STRING",
-                "type": "STRING",
+                  "value": "not"
-                "value": "¬"
+                },
-              }
+                {
-            ]
+                  "type": "STRING",
+                  "value": "¬"
+                }
+              ]
+            }
+          },
+          {
+            "type": "SYMBOL",
+            "name": "_expression"
           }
-        },
+        ]
-        {
+      }
-          "type": "SYMBOL",
-          "name": "_expression"
-        }
-      ]
     },
     "_literal": {
       "type": "CHOICE",

src/node-types.json

@@ -31,6 +31,10 @@
           "type": "identifier",
           "named": true
         },
+        {
+          "type": "index_expression",
+          "named": true
+        },
         {
           "type": "integer_literal",
           "named": true
@@ -82,6 +86,10 @@
             "type": "identifier",
             "named": true
           },
+          {
+            "type": "index_expression",
+            "named": true
+          },
           {
             "type": "integer_literal",
             "named": true
@@ -144,6 +152,10 @@
             "type": "identifier",
             "named": true
           },
+          {
+            "type": "index_expression",
+            "named": true
+          },
           {
             "type": "integer_literal",
             "named": true
@@ -316,6 +328,10 @@
             "type": "identifier",
             "named": true
           },
+          {
+            "type": "index_expression",
+            "named": true
+          },
           {
             "type": "integer_literal",
             "named": true
@@ -341,6 +357,116 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "index_expression",
+    "named": true,
+    "fields": {
+      "collection": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "absent",
+            "named": true
+          },
+          {
+            "type": "array_literal",
+            "named": true
+          },
+          {
+            "type": "binary_operation",
+            "named": true
+          },
+          {
+            "type": "boolean_literal",
+            "named": true
+          },
+          {
+            "type": "float_literal",
+            "named": true
+          },
+          {
+            "type": "identifier",
+            "named": true
+          },
+          {
+            "type": "index_expression",
+            "named": true
+          },
+          {
+            "type": "integer_literal",
+            "named": true
+          },
+          {
+            "type": "set_literal",
+            "named": true
+          },
+          {
+            "type": "string_literal",
+            "named": true
+          },
+          {
+            "type": "unary_operation",
+            "named": true
+          }
+        ]
+      },
+      "indices": {
+        "multiple": true,
+        "required": true,
+        "types": [
+          {
+            "type": ",",
+            "named": false
+          },
+          {
+            "type": "absent",
+            "named": true
+          },
+          {
+            "type": "array_literal",
+            "named": true
+          },
+          {
+            "type": "binary_operation",
+            "named": true
+          },
+          {
+            "type": "boolean_literal",
+            "named": true
+          },
+          {
+            "type": "float_literal",
+            "named": true
+          },
+          {
+            "type": "identifier",
+            "named": true
+          },
+          {
+            "type": "index_expression",
+            "named": true
+          },
+          {
+            "type": "integer_literal",
+            "named": true
+          },
+          {
+            "type": "set_literal",
+            "named": true
+          },
+          {
+            "type": "string_literal",
+            "named": true
+          },
+          {
+            "type": "unary_operation",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "set_literal",
     "named": true,
@@ -373,6 +499,10 @@
           "type": "identifier",
           "named": true
         },
+        {
+          "type": "index_expression",
+          "named": true
+        },
         {
           "type": "integer_literal",
           "named": true
@@ -473,6 +603,10 @@
           "type": "identifier",
           "named": true
         },
+        {
+          "type": "index_expression",
+          "named": true
+        },
         {
           "type": "integer_literal",
           "named": true