c06ddba | plum

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

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

c06ddba — Peter John 2026-08-09T18:35:20+05:30

feat(grammar): add `fun` keyword to function/method declarations

Files changed (17) hide show

tooling/tree-sitter-plum/grammar.js +1 -0
tooling/tree-sitter-plum/queries/plum/highlights.scm +1 -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 +5 -5
tooling/tree-sitter-plum/test/corpus/assert.txt +1 -1
tooling/tree-sitter-plum/test/corpus/assign.txt +2 -2
tooling/tree-sitter-plum/test/corpus/enum.txt +1 -1
tooling/tree-sitter-plum/test/corpus/for.txt +1 -1
tooling/tree-sitter-plum/test/corpus/function.txt +16 -16
tooling/tree-sitter-plum/test/corpus/if.txt +1 -1
tooling/tree-sitter-plum/test/corpus/literals.txt +1 -1
tooling/tree-sitter-plum/test/corpus/match.txt +3 -3
tooling/tree-sitter-plum/test/corpus/type.txt +4 -4
tooling/tree-sitter-plum/test/corpus/while.txt +1 -1
tooling/tree-sitter-plum/test/highlight/sample.plum +4 -4

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

@@ -162,6 +162,7 @@ module.exports = grammar({
     fn: ($) =>
       prec.left(
         seq(
+          "fun",
           field("name", $.fn_identifier),
           field("type", optional(alias($.fn_type, $.type))),
           // A method's implicit receiver may be spelled out explicitly as a bare

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

@@ -74,6 +74,7 @@
   "type"
   "enum"
   "trait"
+  "fun"
 ] @keyword
 [

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

@@ -17,16 +17,16 @@ type Cat(IAnimal, IToStr) =
   name: Str
   age: Int
-withName<Cat>(name: Str) -> Cat =
+fun withName<Cat>(name: Str) -> Cat =
   Cat(name: name, age: self.age)
-withAge<Cat>(age: Int) -> Cat =
+fun withAge<Cat>(age: Int) -> Cat =
   Cat(name: self.name, age: age)
-speak<Cat>() -> Str =
+fun speak<Cat>() -> Str =
   "meow"
-toStr<Cat>() -> Str =
+fun toStr<Cat>() -> Str =
   for i in 0..10
     printLn("delta")
   if dog > 1
@@ -35,5 +35,5 @@ toStr<Cat>() -> Str =
     printLn("New")
   "Cat({self.name}, {self.age})"
-main() =
+fun main() =
   printLn("Hello world")

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

@@ -2,7 +2,7 @@
 assert
 ================================================================================
-main() =
+fun main() =
   assert 1 != 2
   assert 5 > 4
   assert 7 != 9

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

@@ -2,7 +2,7 @@
 assign
 ================================================================================
-main() =
+fun main() =
   sum = 1 + {{2 * 3} / 4}
   enabled = !False
   open = {count > 10} && {enabled == True} || {debug == False}
@@ -267,7 +267,7 @@ main() =
 field assignment target
 ================================================================================
-main() =
+fun main() =
   self.head = value
   self.head.value = x
   a, self.field = 1, 2

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

@@ -6,7 +6,7 @@ enum Bool =
   | True
   | False
-toStr<Bool>() -> Str =
+fun toStr<Bool>() -> Str =
   "Bool"
 --------------------------------------------------------------------------------

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

@@ -2,7 +2,7 @@
 for
 ================================================================================
-main() =
+fun main() =
   for i in 0..10
     printLn("for")
     break

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

@@ -2,7 +2,7 @@
 function - no return
 ================================================================================
-sum(a: Int, b: Int) =
+fun sum(a: Int, b: Int) =
   todo
 --------------------------------------------------------------------------------
@@ -25,7 +25,7 @@ sum(a: Int, b: Int) =
 function - return
 ================================================================================
-sum(a: Int, b: Int) -> Int =
+fun sum(a: Int, b: Int) -> Int =
   todo
 --------------------------------------------------------------------------------
@@ -50,7 +50,7 @@ sum(a: Int, b: Int) -> Int =
 function - default value
 ================================================================================
-random(a: Int = 10) =
+fun random(a: Int = 10) =
   todo
 --------------------------------------------------------------------------------
@@ -72,7 +72,7 @@ random(a: Int = 10) =
 function - generics
 ================================================================================
-add(param: T, param2: List[U]) -> List[U] =
+fun add(param: T, param2: List[U]) -> List[U] =
   todo
 --------------------------------------------------------------------------------
@@ -101,7 +101,7 @@ add(param: T, param2: List[U]) -> List[U] =
 function - method
 ================================================================================
-fullname<User>() -> String =
+fun fullname<User>() -> String =
   todo
 --------------------------------------------------------------------------------
@@ -120,7 +120,7 @@ fullname<User>() -> String =
 function - method with explicit self param
 ================================================================================
-remove<List>(self, v: T) =
+fun remove<List>(self, v: T) =
   todo
 --------------------------------------------------------------------------------
@@ -142,7 +142,7 @@ remove<List>(self, v: T) =
 function - variant construction call (positional args on a capitalized name)
 ================================================================================
-makeSome(v: Int) -> Option =
+fun makeSome(v: Int) -> Option =
   Some(v)
 --------------------------------------------------------------------------------
@@ -170,7 +170,7 @@ makeSome(v: Int) -> Option =
 function - bare comparison as body's trailing statement
 ================================================================================
-isNone(o: Option) -> Bool =
+fun isNone(o: Option) -> Bool =
   o == None
 --------------------------------------------------------------------------------
@@ -196,7 +196,7 @@ isNone(o: Option) -> Bool =
 function - bare boolean-operator as body's trailing statement
 ================================================================================
-bothTrue(a: Bool, b: Bool) -> Bool =
+fun bothTrue(a: Bool, b: Bool) -> Bool =
   a && b
 --------------------------------------------------------------------------------
@@ -228,7 +228,7 @@ bothTrue(a: Bool, b: Bool) -> Bool =
 function - bare ternary as body's trailing statement
 ================================================================================
-pick(cond: Bool, a: Int, b: Int) -> Int =
+fun pick(cond: Bool, a: Int, b: Int) -> Int =
   cond ? a : b
 --------------------------------------------------------------------------------
@@ -267,7 +267,7 @@ pick(cond: Bool, a: Int, b: Int) -> Int =
 function - closure literal in expression position
 ================================================================================
-useClosure() -> Bool =
+fun useClosure() -> Bool =
   cb = |v|
     True
   cb(5)
@@ -302,7 +302,7 @@ useClosure() -> Bool =
 function - closure literal with no params
 ================================================================================
-useClosure() -> Bool =
+fun useClosure() -> Bool =
   cb = ||
     True
   cb()
@@ -333,7 +333,7 @@ useClosure() -> Bool =
 function - function-value type param annotation
 ================================================================================
-each(cb: fn(Int)) -> Bool =
+fun each(cb: fn(Int)) -> Bool =
   True
 --------------------------------------------------------------------------------
@@ -357,7 +357,7 @@ each(cb: fn(Int)) -> Bool =
 function - function-value type param annotation with generic types and return
 ================================================================================
-each(cb: fn(T) -> U) -> Bool =
+fun each(cb: fn(T) -> U) -> Bool =
   True
 --------------------------------------------------------------------------------
@@ -383,7 +383,7 @@ each(cb: fn(T) -> U) -> Bool =
 function - inline closure literal as a call argument
 ================================================================================
-main() -> Int =
+fun main() -> Int =
   each(|v| v)
 --------------------------------------------------------------------------------
@@ -410,7 +410,7 @@ main() -> Int =
 function - multi-line closure literal call argument, closing paren on same line as body
 ================================================================================
-main() -> Int =
+fun main() -> Int =
   each(|v|
     v)

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

@@ -2,7 +2,7 @@
 if
 ================================================================================
-main() =
+fun main() =
   if a < b
     printLn("a is less than b")
   else if a > 9

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

@@ -2,7 +2,7 @@
 literals
 ================================================================================
-main() =
+fun main() =
   start_year = 2101
   a = +123
   b = -111

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

@@ -2,7 +2,7 @@
 match
 ================================================================================
-main() =
+fun main() =
   match a
     1 =>
       printLn(a)
@@ -111,7 +111,7 @@ main() =
 match - inline case bodies
 ================================================================================
-main() =
+fun main() =
   match a
     1 => printLn(a)
     2 => printLn(b)
@@ -164,7 +164,7 @@ main() =
 match - guard-clause arms, no subject
 ================================================================================
-compare(x: Int, y: Int) -> Int =
+fun compare(x: Int, y: Int) -> Int =
   match
     | x > y =>
       1

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

@@ -10,16 +10,16 @@ type Cat(Stringable) =
   name: Str
   age: Int
-init<Cat>(name: Str) -> Cat =
+fun init<Cat>(name: Str) -> Cat =
   Cat(name: name, age: 0)
-withName<Cat>(name: Str) -> Cat =
+fun withName<Cat>(name: Str) -> Cat =
   Cat(name: name, age: 0)
-withAge<Cat>(age: Int) -> Cat =
+fun withAge<Cat>(age: Int) -> Cat =
   Cat(name: "", age: age)
-toStr<Cat>() -> Str =
+fun toStr<Cat>() -> Str =
   "Cat({self.name}, {self.age})"
 --------------------------------------------------------------------------------

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

@@ -2,7 +2,7 @@
 while
 ================================================================================
-main() =
+fun main() =
   i = 0
   while i < 10
     i = i + 1

tooling/tree-sitter-plum/test/highlight/sample.plum CHANGED Viewed

@@ -4,14 +4,14 @@ type Cat(ToStr) =
   name: Str
   age: Int
-withName<Cat>(name: Str) -> Cat =
+fun withName<Cat>(name: Str) -> Cat =
   Cat(name: name, age: self.age)
-withAge<Cat>(age: Int) -> Cat =
+fun withAge<Cat>(age: Int) -> Cat =
   Cat(name: self.name, age: age)
-toStr<Cat>() -> Str =
+fun toStr<Cat>() -> Str =
   "Cat({self.name}, {self.age})"
-main() =
+fun main() =
   printLn("Hello world")