From 2438b742ffee7516f637ddeca6b338ddd00f2500 Mon Sep 17 00:00:00 2001
From: reiniscirpons <rc234@st-andrews.ac.uk>
Date: Wed, 28 Aug 2024 16:20:30 +0100
Subject: [PATCH] chore: Update version number and tidy up Makefile

---
 .gitignore       |   1 +
 Cargo.toml       |   2 +-
 Makefile         |   7 +--
 package.json     |  11 ++--
 pyproject.toml   |   2 +-
 src/grammar.json | 129 +++++++++++++++++++++++------------------------
 6 files changed, 73 insertions(+), 79 deletions(-)

diff --git a/.gitignore b/.gitignore
index a798326..be5cf8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ temp_*/
 log.html
 examples/corpus_*.tar.gz
 *.egg-info
+gap.so
diff --git a/Cargo.toml b/Cargo.toml
index 10ae859..c3828d5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-gap"
 description = "gap grammar for the tree-sitter parsing library"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Max Horn", "Reinis Cirpons <rc234@st-andrews.ac.uk>"]
 keywords = ["incremental", "parsing", "gap", "gap-system"]
 categories = ["parsing", "text-editors"]
diff --git a/Makefile b/Makefile
index 2b9ee3c..08abcf0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-CORPUS_VERSION=v4.13.0
+CORPUS_VERSION=v4.13.1
+GRAMMAR_VERSION=v0.3.0
 EXAMPLES_DIR=./examples
 RELEASE_PREFIX=https://github.com/gap-system/tree-sitter-gap/releases/download
 
@@ -16,10 +17,10 @@ corpus:
 	mv ./temp_extract_corpus/corpus_pkg.tar.gz $(EXAMPLES_DIR)/corpus_pkg_$(CORPUS_VERSION).tar.gz
 
 $(EXAMPLES_DIR)/corpus_gap_$(CORPUS_VERSION).tar.gz:
-	curl -L $(RELEASE_PREFIX)/v0.2.0/corpus_gap_$(CORPUS_VERSION).tar.gz > $(EXAMPLES_DIR)/corpus_gap_$(CORPUS_VERSION).tar.gz
+	curl -L $(RELEASE_PREFIX)/$(GRAMMAR_VERSION)/corpus_gap_$(CORPUS_VERSION).tar.gz > $(EXAMPLES_DIR)/corpus_gap_$(CORPUS_VERSION).tar.gz
 
 $(EXAMPLES_DIR)/corpus_pkg_$(CORPUS_VERSION).tar.gz:
-	curl -L $(RELEASE_PREFIX)/v0.2.0/corpus_pkg_$(CORPUS_VERSION).tar.gz > $(EXAMPLES_DIR)/corpus_pkg_$(CORPUS_VERSION).tar.gz
+	curl -L $(RELEASE_PREFIX)/$(GRAMMAR_VERSION)/corpus_pkg_$(CORPUS_VERSION).tar.gz > $(EXAMPLES_DIR)/corpus_pkg_$(CORPUS_VERSION).tar.gz
 
 $(EXAMPLES_DIR)/temp_corpus_gap_$(CORPUS_VERSION): $(EXAMPLES_DIR)/corpus_gap_$(CORPUS_VERSION).tar.gz
 	mkdir -p $(EXAMPLES_DIR)/temp_corpus_gap_$(CORPUS_VERSION)
diff --git a/package.json b/package.json
index a42685d..b2ec559 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-gap",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "gap grammar for tree-sitter",
   "keywords": [
     "tree-sitter",
@@ -64,12 +64,9 @@
         "gi",
         "gd"
       ],
-      "highlights": [
-        "queries/highlights.scm"
-      ],
-      "locals": [
-        "queries/locals.scm"
-      ]
+      "highlights": "queries/highlights.scm",
+      "locals": "queries/locals_ts.scm",
+      "tags": "queries/tags.scm"
     }
   ]
 }
diff --git a/pyproject.toml b/pyproject.toml
index d2a1c7b..b800fe6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "tree-sitter-gap"
 description = "gap grammar for tree-sitter"
-version = "0.2.0"
+version = "0.3.0"
 keywords = ["incremental", "parsing", "tree-sitter", "gap"]
 classifiers = [
   "Intended Audience :: Developers",
diff --git a/src/grammar.json b/src/grammar.json
index 8610220..09a9907 100644
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -1775,103 +1775,98 @@
       }
     },
     "argument_list": {
-      "type": "CHOICE",
+      "type": "SEQ",
       "members": [
         {
-          "type": "SEQ",
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "CHOICE",
           "members": [
             {
-              "type": "STRING",
-              "value": "("
-            },
-            {
-              "type": "CHOICE",
+              "type": "SEQ",
               "members": [
                 {
-                  "type": "SEQ",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "_expression"
-                    },
-                    {
-                      "type": "REPEAT",
-                      "content": {
-                        "type": "SEQ",
-                        "members": [
-                          {
-                            "type": "STRING",
-                            "value": ","
-                          },
-                          {
-                            "type": "SYMBOL",
-                            "name": "_expression"
-                          }
-                        ]
-                      }
-                    }
-                  ]
+                  "type": "SYMBOL",
+                  "name": "_expression"
                 },
                 {
-                  "type": "BLANK"
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": ","
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "_expression"
+                      }
+                    ]
+                  }
                 }
               ]
             },
             {
-              "type": "CHOICE",
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
               "members": [
                 {
-                  "type": "SEQ",
+                  "type": "STRING",
+                  "value": ":"
+                },
+                {
+                  "type": "CHOICE",
                   "members": [
                     {
-                      "type": "STRING",
-                      "value": ":"
-                    },
-                    {
-                      "type": "CHOICE",
+                      "type": "SEQ",
                       "members": [
                         {
-                          "type": "SEQ",
-                          "members": [
-                            {
-                              "type": "SYMBOL",
-                              "name": "function_call_option"
-                            },
-                            {
-                              "type": "REPEAT",
-                              "content": {
-                                "type": "SEQ",
-                                "members": [
-                                  {
-                                    "type": "STRING",
-                                    "value": ","
-                                  },
-                                  {
-                                    "type": "SYMBOL",
-                                    "name": "function_call_option"
-                                  }
-                                ]
-                              }
-                            }
-                          ]
+                          "type": "SYMBOL",
+                          "name": "function_call_option"
                         },
                         {
-                          "type": "BLANK"
+                          "type": "REPEAT",
+                          "content": {
+                            "type": "SEQ",
+                            "members": [
+                              {
+                                "type": "STRING",
+                                "value": ","
+                              },
+                              {
+                                "type": "SYMBOL",
+                                "name": "function_call_option"
+                              }
+                            ]
+                          }
                         }
                       ]
+                    },
+                    {
+                      "type": "BLANK"
                     }
                   ]
-                },
-                {
-                  "type": "BLANK"
                 }
               ]
             },
             {
-              "type": "STRING",
-              "value": ")"
+              "type": "BLANK"
             }
           ]
+        },
+        {
+          "type": "STRING",
+          "value": ")"
         }
       ]
     },