plum

git clone https://pyrossh.dev/repos/plum.git

A statically typed, imperative programming language inspired by rust, python

58cc293c — pyrossh

finish syntax

Files changed (12) hide show

tooling/tree-sitter-plum/Makefile +1 -1
tooling/tree-sitter-plum/grammar.js +14 -19
tooling/tree-sitter-plum/queries/plum/highlights.scm +2 -0
tooling/tree-sitter-plum/queries/plum/indents.scm +28 -0
tooling/tree-sitter-plum/queries/plum/injections.scm +2 -0
tooling/tree-sitter-plum/src/grammar.json +0 -0
tooling/tree-sitter-plum/src/node-types.json +0 -0
tooling/tree-sitter-plum/src/parser.c +0 -0
tooling/tree-sitter-plum/test/aa.plum +6 -1
tooling/tree-sitter-plum/test/corpus/const.txt +115 -0
tooling/tree-sitter-plum/test/corpus/for.txt +5 -1
tooling/tree-sitter-plum/tree-sitter.json +3 -0

tooling/tree-sitter-plum/Makefile CHANGED Viewed

@@ -4,4 +4,4 @@ build:
 corpus_test:
 		tree-sitter generate
-		tree-sitter test -i "type"
+		tree-sitter test

tooling/tree-sitter-plum/grammar.js CHANGED Viewed

@@ -18,10 +18,6 @@ const PREC = {
   call: 23,
 };
-// a == 2 ? b : c
-// a ?: b
 const DEC_DIGITS = token(sep1(/[0-9]+/, /_+/));
 const HEX_DIGITS = token(sep1(/[0-9a-fA-F]+/, /_+/));
 const BIN_DIGITS = token(sep1(/[01]/, /_+/));
@@ -62,13 +58,12 @@ module.exports = grammar({
   rules: {
     source: ($) =>
       seq(
-        optional(seq("module", $.module)),
+        optional($.module),
         repeat($.import),
-        repeat(choice($.class, $.trait, $.enum, $.fn)),
+        repeat(choice($.class, $.trait, $.enum, $.fn, $.const)),
       ),
-    module: ($) => $.var_identifier,
+    module: ($) => seq("module", $.mod_identifier),
     import: ($) => seq("import", $.url),
     url: () => sep1(/[a-zA-Z_][a-zA-Z_0-9]*/, "/"),
@@ -173,6 +168,13 @@ module.exports = grammar({
         $.primary_expression
       ),
+    const: ($) =>
+      seq(
+        field("left", commaSep1($.const_identifier)),
+        "=",
+        field("right", commaSep1($.expression)),
+      ),
     assign: ($) =>
       seq(
         field("left", commaSep1($.var_identifier)),
@@ -371,11 +373,11 @@ module.exports = grammar({
         field("function", $.fn_identifier),
         field(
           "arguments",
-          $.argument_list,
+          $.fn_argument_list,
         ),
       )),
-    argument_list: ($) =>
+    fn_argument_list: ($) =>
       seq(
         "(",
         optional(
@@ -439,13 +441,6 @@ module.exports = grammar({
       '}',
     ),
-    // _f_expression: $ => choice(
-    //   $.expression,
-    //   $.expression_list,
-    //   $.pattern_list,
-    //   $.yield,
-    // ),
     escape_sequence: _ => token.immediate(prec(1, seq(
       '\\',
       choice(
@@ -479,14 +474,12 @@ module.exports = grammar({
           seq(DEC_DIGITS, /[fF]/),
         ),
       ),
     integer: ($) =>
       choice(
         token(seq(optional(/[1-9]/), DEC_DIGITS)),
         token(seq("0", /[xX]/, HEX_DIGITS)),
         token(seq("0", /[bB]/, BIN_DIGITS)),
       ),
     self: (_) => /self/,
     comment: _ => token(seq('#', /.*/)),
     identifier: (_) => /[_a-z][_a-zA-Z0-9]*/,
@@ -495,6 +488,8 @@ module.exports = grammar({
     b: (_) => token("b"),
     c: (_) => token("c"),
     d: (_) => token("d"),
+    mod_identifier: () => /[a-z]+(_[a-z0-9]+)*/, // lower snake case
+    const_identifier: (_) => /[A-Z]+(_[A-Z0-9]+)*/, // upper snake case
     var_identifier: (_) => /[a-z]+(_[a-z0-9]+)*/, // lower snake case
     fn_identifier: (_) => /[a-z][a-zA-Z0-9]*/, // camel case
     type_identifier: (_) => /[A-Z][a-zA-Z0-9]*/, // capital case

tooling/tree-sitter-plum/queries/plum/highlights.scm CHANGED Viewed

@@ -1,5 +1,7 @@
+; (mod_identifier) @constant
 (type_identifier) @type
 (fn_identifier) @function
+(const_identifier) @constant
 (fn
   (fn_identifier) @function)

tooling/tree-sitter-plum/queries/plum/indents.scm ADDED Viewed

@@ -0,0 +1,28 @@
+[
+  (enum)
+  (trait)
+  (class)
+  (fn)
+  (for)
+  (while)
+  (if)
+  (else)
+  (else_if)
+  (body)
+] @indent
+[
+  (if)
+  (for)
+  (while)
+  (fn)
+  (class)
+  (enum)
+  (trait)
+] @extend
+[
+  (return)
+  (break)
+  (continue)
+] @extend.prevent-once

tooling/tree-sitter-plum/queries/plum/injections.scm ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ ((comment) @injection.content
2	+ (#set! injection.language "comment"))

tooling/tree-sitter-plum/src/grammar.json CHANGED Viewed

Binary file

tooling/tree-sitter-plum/src/node-types.json CHANGED Viewed

Binary file

tooling/tree-sitter-plum/src/parser.c CHANGED Viewed

Binary file

tooling/tree-sitter-plum/test/aa.plum CHANGED Viewed

@@ -3,7 +3,12 @@ module std
 import std/int
 import std/str
+PI = 3.14
+MSG = "Hello World"
+SUM = 1 + {{2 * 3} / 4}
+ENABLED = !False
-# Animal is a behavior of every animal
+# Animal is a set of behavior of every animal species
 trait Animal =
   speak() -> Str

tooling/tree-sitter-plum/test/corpus/const.txt ADDED Viewed

@@ -0,0 +1,115 @@
+================================================================================
+const
+================================================================================
+PI = 3.14
+MSG = "Hello World"
+SUM = 1 + {{2 * 3} / 4}
+ENABLED = !False
+OPEN = {count > 10} && {enabled == True} || {debug == False}
+COUNTRIES_LIST = listOf("US", "INDIA", "CANADA")
+--------------------------------------------------------------------------------
+(source
+  (const
+    (const_identifier)
+    (expression
+      (primary_expression
+        (float))))
+  (const
+    (const_identifier)
+    (expression
+      (primary_expression
+        (string
+          (string_start)
+          (string_content)
+          (string_end)))))
+  (const
+    (const_identifier)
+    (expression
+      (primary_expression
+        (binary_operator
+          (primary_expression
+            (integer))
+          (primary_expression
+            (parenthesized_expression
+              (expression
+                (primary_expression
+                  (binary_operator
+                    (primary_expression
+                      (parenthesized_expression
+                        (expression
+                          (primary_expression
+                            (binary_operator
+                              (primary_expression
+                                (integer))
+                              (primary_expression
+                                (integer)))))))
+                    (primary_expression
+                      (integer)))))))))))
+  (const
+    (const_identifier)
+    (expression
+      (not_operator
+        (expression
+          (primary_expression
+            (type_identifier))))))
+  (const
+    (const_identifier)
+    (expression
+      (boolean_operator
+        (expression
+          (boolean_operator
+            (expression
+              (primary_expression
+                (parenthesized_expression
+                  (expression
+                    (comparison_operator
+                      (primary_expression
+                        (var_identifier))
+                      (primary_expression
+                        (integer)))))))
+            (expression
+              (primary_expression
+                (parenthesized_expression
+                  (expression
+                    (comparison_operator
+                      (primary_expression
+                        (var_identifier))
+                      (primary_expression
+                        (type_identifier)))))))))
+        (expression
+          (primary_expression
+            (parenthesized_expression
+              (expression
+                (comparison_operator
+                  (primary_expression
+                    (var_identifier))
+                  (primary_expression
+                    (type_identifier))))))))))
+  (const
+    (const_identifier)
+    (expression
+      (primary_expression
+        (fn_call
+          (fn_identifier)
+          (argument_list
+            (expression
+              (primary_expression
+                (string
+                  (string_start)
+                  (string_content)
+                  (string_end))))
+            (expression
+              (primary_expression
+                (string
+                  (string_start)
+                  (string_content)
+                  (string_end))))
+            (expression
+              (primary_expression
+                (string
+                  (string_start)
+                  (string_content)
+                  (string_end))))))))))

tooling/tree-sitter-plum/test/corpus/for.txt CHANGED Viewed

@@ -5,6 +5,8 @@ for
 main() =
   for i in 0..10
     printLn("for")
+    break
+    continue
 --------------------------------------------------------------------------------
@@ -30,4 +32,6 @@ main() =
                     (string
                       (string_start)
                       (string_content)
-                      (string_end))))))))))))
+                      (string_end)))))))
+          (break)
+          (continue))))))

tooling/tree-sitter-plum/tree-sitter.json CHANGED Viewed

@@ -14,6 +14,9 @@
       "tags": [
         "queries/tags.scm"
       ],
+      "indents": [
+        "queries/indents.scm"
+      ],
       "injection-regex": "plum"
     }
   ],

~repos /plum

git clone https://pyrossh.dev/repos/plum.git

A statically typed, imperative programming language inspired by rust, python