Merge pull request #80 from alaviss/for-0.5.0

changes staged for 0.5.0

Notable changes:

- Reduced the amount of states used for tracking layout
- Support for concept without a body
- Support for type(x) expressions at the top level

Shortlog:

  Leorize (9):
        remove flag and indentation tracking across scans
        allow concept body to be omitted
        grammar: share if alternatives between if and case
        eslint: disable useless-escape rule
        grammar: factor out for loop body
        support old type(x) expression in statement lists
        update readme for the current project status
        ci: bump upload/download artifact version
        bump version to 0.5.0

.eslintrc.json

@@ -10,6 +10,7 @@
     "ecmaVersion": "latest"
   },
   "rules": {
-    "no-undef": "off"
+    "no-undef": "off",
+    "no-useless-escape": "off"
   }
 }

.github/FUNDING.yml

@@ -0,0 +1,5 @@
+# Copyright 2023 leorize <leorize+oss@disroot.org>
+#
+# SPDX-License-Identifier: CC0-1.0
+
+github: alaviss

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       - run: npm run build
 
       - name: Upload built parser to artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: parser
           path: src/parser.c
@@ -33,7 +33,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download generated parser
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: parser
           path: src/
@@ -57,7 +57,7 @@ jobs:
           node-version: "16"
           cache: "npm"
       - name: Download generated parser
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: parser
           path: src/
@@ -79,7 +79,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download generated parser
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: parser
           path: src/

Cargo.toml

@@ -5,7 +5,7 @@
 [package]
 name = "tree-sitter-nim"
 description = "nim grammar for the tree-sitter parsing library"
-version = "0.4.0"
+version = "0.5.0"
 keywords = ["incremental", "parsing", "nim"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/tree-sitter/tree-sitter-nim"

corpus/declarations.txt

@@ -758,6 +758,8 @@ type
 
     g.outgoingEdges(v) is Enumerable[EdgeType]
 
+  Empty = concept
+
 --------------------------------------------------------------------------------
 
 (source_file
@@ -884,7 +886,11 @@ type
             right: (bracket_expression
               left: (identifier)
               right: (argument_list
-                (identifier)))))))))
+                (identifier)))))))
+    (type_declaration
+      (type_symbol_declaration
+        name: (identifier))
+      (concept_declaration))))
 
 ================================================================================
 Routine declarations

corpus/errors.txt

@@ -9,8 +9,39 @@ type
 
 --------------------------------------------------------------------------------
 
+(ERROR
+  (type_declaration
+    (type_symbol_declaration
+      (identifier))
+    (object_declaration
+      (field_declaration_list
+        (ERROR
+          (variant_discriminator_declaration
+            (symbol_declaration_list
+              (symbol_declaration
+                (identifier))))
+          (identifier))))))
+
+================================================================================
+Error incomplete field within object variant
+================================================================================
+
+type
+  A = object
+
+  B = object
+    case x: int
+    of y:
+      k:
+
+--------------------------------------------------------------------------------
+
 (source_file
   (type_section
+    (type_declaration
+      (type_symbol_declaration
+        (identifier))
+      (object_declaration))
     (type_declaration
       (type_symbol_declaration
         (identifier))
@@ -20,9 +51,17 @@ type
             (variant_discriminator_declaration
               (symbol_declaration_list
                 (symbol_declaration
-                  (identifier)))))
-          (ERROR
-            (identifier)))))))
+                  (identifier)))
+              (type_expression
+                (identifier)))
+            (of_branch
+              (expression_list
+                (identifier))
+              (field_declaration_list
+                (ERROR
+                  (symbol_declaration_list
+                    (symbol_declaration
+                      (identifier))))))))))))
 
 ================================================================================
 Error within statements with body
@@ -124,10 +163,9 @@ let
 
 (source_file
   (let_section
-    (variable_declaration
+    (ERROR
       (symbol_declaration_list
         (symbol_declaration
           (identifier)))
       (type_expression
-        (identifier)))
-    (ERROR)))
+        (identifier)))))

corpus/expressions.txt

@@ -1777,3 +1777,82 @@ foobar""""extra spicy""""
   (generalized_string
     function: (identifier)
     (string_content)))
+
+================================================================================
+Old typeof expressions
+================================================================================
+
+proc foo(x: type y)
+var x: type y
+(type y)
+
+type(x)
+type (y)
+
+type(x) is Y
+type(x) + y * z
+type(x) * y - y
+type(x) + y + z
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (proc_declaration
+    name: (identifier)
+    parameters: (parameter_declaration_list
+      (parameter_declaration
+        (symbol_declaration_list
+          (symbol_declaration
+            name: (identifier)))
+        type: (type_expression
+          (call
+            function: (identifier)
+            (argument_list
+              (identifier)))))))
+  (var_section
+    (variable_declaration
+      (symbol_declaration_list
+        (symbol_declaration
+          name: (identifier)))
+      type: (type_expression
+        (call
+          function: (identifier)
+          (argument_list
+            (identifier))))))
+  (parenthesized
+    (call
+      function: (identifier)
+      (argument_list
+        (identifier))))
+  (typeof
+    (identifier))
+  (typeof
+    (identifier))
+  (infix_expression
+    left: (typeof
+      (identifier))
+    right: (identifier))
+  (infix_expression
+    left: (typeof
+      (identifier))
+    operator: (operator)
+    right: (infix_expression
+      left: (identifier)
+      operator: (operator)
+      right: (identifier)))
+  (infix_expression
+    left: (infix_expression
+      left: (typeof
+        (identifier))
+      operator: (operator)
+      right: (identifier))
+    operator: (operator)
+    right: (identifier))
+  (infix_expression
+    left: (infix_expression
+      left: (typeof
+        (identifier))
+      operator: (operator)
+      right: (identifier))
+    operator: (operator)
+    right: (identifier)))