plum

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

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

fd085d94 — pyrossh

new rules

Files changed (15) hide show

libs/std/bool.plum +61 -21
libs/std/float.plum +49 -77
libs/std/int.plum +63 -67
libs/std/json.plum +2 -2
libs/std/list.plum +170 -172
libs/std/map.plum +9 -0
libs/std/str.plum +107 -130
tooling/tree-sitter-plum/grammar.js +19 -25
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/corpus/assign.txt +5 -3
tooling/tree-sitter-plum/test/corpus/enum.txt +15 -2
tooling/tree-sitter-plum/test/corpus/type.txt +111 -107
tooling/vscode-plum/syntaxes/plum.tmLanguage.json +2 -17

libs/std/bool.plum CHANGED Viewed

@@ -1,26 +1,66 @@
 module std
+type Int =
+  add(b: Int) -> Int = this + b
+  sub(b: Int) -> Int = this - b
-Bool =
+enum Bool =
   | True
   | False
+  and(other: Bool) -> Bool =
-# Might not be needed
+    match this, other
+      True, True => True
+      True, False => False
+      False, True => False
+      False, False => False
+  or(other: Bool) -> Bool =
+    match this, other
+      True, True => True
+      True, False => True
+      False, True => True
+      False, False => False
-Bool\toStr() -> Str =
+  toStr() -> Str =
+    match this
-  if this == True
+      True => "True"
+      False => "False"
+  fromStr(s: Str) -> Result(Bool, Err) =
-    "True"
+    if s == "true"
+      True
+    else if s == "false"
+      False
-  else
+    else
+      Err("could not parse bool from '{s}'")
-    "False"
+type Result =
+  | Ok(a)
+  | Err(b)
+type Option =
+  | Some(a)
+  | None
-Bool\and(other: Bool) -> Bool =
+readFile() -> Result(String, Err) =
+  return Err
+data = try readFile()
+if Ok(d) = readFile()
+  println(d)
-  match this, other is
+match readFile()
+  Ok(d) =>
+    printLn(d)
-    True, True => True
+  Err(e) =>
-    True, False => False
+    printErr(e)
-    False, True => False
-    False, False => False
-Bool\or(other: Bool) -> Bool =
-  match this, other is
+type List =
+  | Empty
-    True, True => True
+  | Node(a)
-    True, False => True
-    False, True => True
+  add() =
-    False, False => False

libs/std/float.plum CHANGED Viewed

@@ -1,80 +1,52 @@
 module std/float
-# Euler's number, the base of natural logarithms, e, https://oeis.org/A001113
-E = 2.718f
-# The natural logarithm of 10, https://oeis.org/A002392
-LN10 = 2.302f
-# The natural logarithm of 2 https://oeis.org/A002162
-LN2 = 0.693f
-# The base 10 logarithm of e # formula: 1 / LN10
-LOG10E = 0.434f
-# The base 2 logarithm of e # formula: 1 / LN2
-LOG2E = 1.442f
-# The ratio of the circumference of a circle to its diameter https://oeis.org/A000796
-PI = 3.14159f
-# https://oeis.org/A001622
-PHI = 1.6180f
-# The square root of 1/2
-SQRT1_2 = 0.707f
-# The square root of 2 https://oeis.org/A002193
-SQRT2 = 1.414f
-# https://oeis.org/A019774
-SQRT_E = 1.64872f
-# https://oeis.org/A002161
-SQRT_PI  = 1.77245f
-# https://oeis.org/A139339
-SQRT_PHI = 1.27201f
-# The difference between 1 and the smallest floating point number greater than 1 formula: 7/3 - 4/3 - 1
-EPSILON = 2.220446049250313e-16f
-# Lowest value of float
-MIN_FLOAT_VALUE = 4.9406564584124654417656879286822137236505980e-324
-# Highest value of float
-MAX_FLOAT_VALUE = 1.79769313486231570814527423731704356798070e+308
-Float::PI=3.14
-fn acosh(v: float): float =
-  when
-    x < 1 | IsNaN(x) -> // first case is special case
-      NaN()
-    x == 1 ->
-      0
-    x >= Large ->
-      Log(x) + Ln2 // x > 2**28
-    x > 2 ->
-      Log(2*x - 1/(x+Sqrt(x*x-1))) // 2**28 > x > 2
-    _ ->
-      t := x - 1
-      // ((2*t+t*t).sqrt() + t).log1p()
-      Log1p(t + Sqrt(2*t+t*t)) // 2 >= x > 1
-fn is_finite(): bool = true
-  ` Check whether this number is finite, ie not +/-infinity and not NaN.
-  ` True if exponent is not all 1s
-  (bits() and 0x7FF0_0000_0000_0000) != 0x7FF0_0000_0000_0000
-# Check whether this number is +/-infinity
-is_infinite:  Bool =>
+type Float =
+  E = 2.718f  # Euler's number, the base of natural logarithms, e, https://oeis.org/A001113
+  LN10 = 2.302f # The natural logarithm of 10, https://oeis.org/A002392
+  LN2 = 0.693f # The natural logarithm of 2 https://oeis.org/A002162
+  LOG10E = 0.434f # The base 10 logarithm of e # formula: 1 / LN10
+  LOG2E = 1.442f # The base 2 logarithm of e # formula: 1 / LN2
+  PI = 3.14159f # The ratio of the circumference of a circle to its diameter https://oeis.org/A000796
+  PHI = 1.6180f # https://oeis.org/A001622
+  SQRT1_2 = 0.707f # The square root of 1/2
+  SQRT2 = 1.414f # The square root of 2 https://oeis.org/A002193
+  SQRT_E = 1.64872f # https://oeis.org/A019774
+  SQRT_PI  = 1.77245f # https://oeis.org/A002161
+  SQRT_PHI = 1.27201f # https://oeis.org/A139339
+  EPSILON = 2.220446049250313e-16f # The difference between 1 and the smallest floating point number greater than 1 formula: 7/3 - 4/3 - 1
+  MIN_FLOAT_VALUE = 4.9406564584124654417656879286822137236505980e-324 # Lowest value of float
+  MAX_FLOAT_VALUE = 1.79769313486231570814527423731704356798070e+308   # Highest value of float
+  ::fromStr(s: Str) -> Result(Float, Err) =
+    todo
+  acosh(v: Float) -> Float =
+    match
+      x < 1 | IsNaN(x) => NaN() # first case is special case
+      x == 1 => 0
+      x >= Large => x.log() + LN2 # x > 2**28
+      x > 2 => Log(2*x - 1/(x+Sqrt(x*x-1))) # 2**28 > x > 2
+      _ =>
+        t =
+        ((2*t+t*t).sqrt() + t).log1p() 2 >= x > 1
+  # Check whether this number is finite, ie not +/-infinity and not NaN.
+  # True if exponent is not all 1s
+  isFinite() -> Bool =
+    (bits() && 0x7FF0_0000_0000_0000) != 0x7FF0_0000_0000_0000
+  # Check whether this number is +/-infinity
   # True if exponent is all 1s and mantissa is 0
+  isInfinite() -> Bool =
-  ((bits() and 0x7FF0_0000_0000_0000) == 0x7FF0_0000_0000_0000) and  # exp
+    ((bits() && 0x7FF0_0000_0000_0000) == 0x7FF0_0000_0000_0000) &&  # exp
-  ((bits() and 0x000F_FFFF_FFFF_FFFF) == 0)  // mantissa
+    ((bits() && 0x000F_FFFF_FFFF_FFFF) == 0)  # mantissa
-// Check whether this number is NaN.
+  # Check whether this number is NaN.
-fn is_nan(): Bool =>
-  // True if exponent is all 1s and mantissa is non-0
+  # True if exponent is all 1s and mantissa is non-0
+  isNaN() -> Bool =
-  ((bits() and 0x7FF0_0000_0000_0000) == 0x7FF0_0000_0000_0000) and  // exp
+    ((bits() && 0x7FF0_0000_0000_0000) == 0x7FF0_0000_0000_0000) &&  # exp
-  ((bits() and 0x000F_FFFF_FFFF_FFFF) != 0)  // mantissa
+    ((bits() && 0x000F_FFFF_FFFF_FFFF) != 0)  # mantissa
+  toStr() -> Str =
+    todo

libs/std/int.plum CHANGED Viewed

@@ -1,95 +1,91 @@
 module std/int
-Int: Comparable, ToStr = ByteArray
+type Int : Comparable, ToStr =
+  MIN_VALUE = -0x8000_0000_0000_0000 # Lowest value of Int
+  MAX_VALUE = 0x7FFF_FFFF_FFFF_FFFF  # Highest value of Int
+  LARGE = 1 << 28 # 2**28
-# Lowest value of Int
-Int::MIN_VALUE = -0x8000_0000_0000_0000
+  ::random() -> Float = # Return random number
+    todo
-# Highest value of Int
-Int::MAX_VALUE = 0x7FFF_FFFF_FFFF_FFFF
+  ::parseInt() -> Result(Int, Err) =
+    0
+  # returns the absolute value of the Int
-# 2**28
+  abs() -> Int =
-Int::LARGE = 1 << 28
+    this < 0 ? -this : this
-Int::random(): Float =
+  ceil() -> Float =
-  todo
+    todo
-# returns the absolute value of the Int
-Int\abs() -> Int =
+  floor() -> Float =
-  this < 0 ? -this : this
+    todo
-Int\ceil() -> Float =
+  round() -> Float =
-  todo
+    todo
-Int\floor() -> Float =
+  trunc() -> Float =
-  todo
+    todo
-Int\round() -> Float =
+  log() -> Float =
-  todo
+    todo
-Int\trunc() -> Float =
+  log2() -> Float =
-  todo
+    todo
-Int\log() -> Float =
+  log10() -> Float =
-  todo
+    todo
-Int\log2() -> Float =
+  logb() -> Float =
-  todo
+    todo
-Int\log10() -> Float =
+  pow(y: Float) -> Float =
-  todo
+    LibM.pow(this, y)
-Int\logb() -> Float =
+  pow(y: Int) -> Float =
-  todo
+    pow(y.toFloat())
-Int\pow(y: Float) -> Float =
-  LibM.pow(this, y)
-Int\pow(y: Int) -> Float =
-  pow(y.toFloat())
-Int\sqrt() -> Float =
+  sqrt() -> Float =
-  if this < 0.0 then
+    if this < 0.0 then
-    _nan()
+      _nan()
-  else
+    else
-    LibM.sqrt(this)
+      LibM.sqrt(this)
-  end
-Int\asin(v: Float) =
+  asin(v: Float) =
-  todo
+    todo
-Int\acos(v: Float) =
+  acos(v: Float) =
-  if v < 0.1
+    if v < 0.1
-    asin(v)
+      asin(v)
-  else
+    else
-    asin(-v)
+      asin(-v)
-Int\asinh(v: Float) =
+  asinh(v: Float) =
-  todo
+    todo
-Int\atan(v: Float) =
+  atan(v: Float) =
-  todo
+    todo
-Int\atan2(v: Float) =
+  atan2(v: Float) =
-  todo
+    todo
-Int\atanh(v: Float) =
+  atanh(v: Float) =
-  todo
+    todo
-Int\cbrt(v: Float) =
+  cbrt(v: Float) =
-  todo
+    todo
-Int\ceil(v: Float) =
+  ceil(v: Float) =
-  todo
+    todo
-Int\clz32(v: Float) =
+  clz32(v: Float) =
-  todo
+    todo
-Int\cos(v: Float) =
+  cos(v: Float) =
-  todo
+    todo
-Int\cosh(v: Float) =
+  cosh(v: Float) =
-  todo
+    todo
-Int\exp(v: Float) =
+  exp(v: Float) =
-  todo
+    todo

libs/std/json.plum CHANGED Viewed

@@ -15,7 +15,7 @@ JsonParseError = {
   token: Char
 }
-Json\\parse(src: Str | Buffer | IO) -> Json | JsonParseError =
+Json::parse(src: Str | Buffer | IO) -> Json | JsonParseError =
   JsonParser.withSrc(src).parse()
 Json\parseNone() -> None | JsonParseError =
@@ -50,7 +50,7 @@ JsonParser::withSrc(src: Str | Buffer | IO) -> JsonParser =
 fn isSpace(c: U32): Bool => (c == ' ') or ((c >= '\t') and (c <= '\r'))
 fn isDelim(c: U32): Bool =>
-    (c == ',') or (c == '}') or (c == ':') or (c == ']') or (_is_space(c)) or (c == 0)
+    (c == ',') || (c == '}') || (c == ':') || (c == ']') || (_is_space(c)) || (c == 0)
 fn isDigit(c: U32) -> Bool {
   return (c >= '0') && (c <= '9')

libs/std/list.plum CHANGED Viewed

@@ -1,176 +1,174 @@
 module std
-# A node stores the data in a list and contains pointers to the previous and next sibling nodes
+`A node stores the data in a list and contains pointers to the previous and next sibling nodes
-Node = {
+type Node =
-  value: V
+  value: a
-  prev: Node(a) | Nil
+  prev: Option[Node]
-  next: Node(a) | Nil
+  next: Option[Node]
-}
-# A list is a data structure describing a contiguous section of an array stored separately from the slice variable itself.
+`A list is a data structure describing a contiguous section of an array stored separately from the slice variable itself.
-# It contains the pointers to the start and end nodes (head, tail) and maintains the size as well
+`It contains the pointers to the start and end nodes (head, tail) and maintains the size as well
-List = {
+class List
-  head: Node(a) | Nil
+  head: Option[Node]
-  tail: Node(a) | Nil
+  tail: Option[Node]
   size: Int
-}
-List\init(values: ...a) -> List(a) =
+  init(values: ...a) -> List =
-  List().add(values...)
+    List().add(values...)
-# gets the element at i'th index of the list
+  `gets the element at i'th index of the list
-List\get(i: Int) -> a =
+  get(i: Int) -> a =
-  current = l.head
+    current = this.head
-  index = 0
+    index = 0
-  while current != Nil
+    while current != Nil
-    if index == i
+      if index == i
-      current.value
+        current.value
-    else
+      else
+        current = current.next
+        index += 1
+  `sets the element at i'th index of the list
+  set(i: Int, v: a) -> a =
+    todo
+  `returns the no of elements in the list
+  length() -> Int =
+    this.size
+  add(values: ...a) =
+    `adds the specified elements to the start of the list
+    for v in values
+      this.head = Node(value: v, prev: Nil, next: this.head)
+      this.head.next.prev = this.head
+      this.size += 1
+  `removes the element at i'th index of the list
+  removeAt(i: Int) =
+    this.tail?.prev?.next = Nil
+    `old tail node gets deallocated due to zero reference count
+    this.tail = list.tail?.prev
+    this.size -= 1
+  `removes the element v from list
+  remove(v: a) =
+    this.tail?.prev?.next = Nil
+    `old tail node gets deallocated due to zero reference count
+    this.tail = list.tail?.prev
+    this.size -= 1
+  `removes all objects from this list
+  clear() =
+    this.tail?.prev?.next = Nil
+    `old tail node gets deallocated due to zero reference count
+    this.tail = list.tail?.prev
+    this.size -= 1
+  `returns a new list with the elements in reverse order.
+  reverse(v: fn(v: a) -> Bool) -> List =
+      todo
+  `returns a new list with the elements sorted by sorter
+  sort(sorter: fn(v: a) -> Bool) -> List =
+      todo
+  `returns an item and index in the list if the item is is equal to search item
+  find(search: a): Option[a] =
+      todo
+  `returns the index of an item in the list if present and comparable otherwise Nil
+  contains(v: a) -> Bool =
+      todo
+  `calls f for each elem in the list
+  each(cb: fn(v: a)) -> Unit =
+    current := this.head
+    while current != Nil
+      cb(current.value)
       current = current.next
-      index += 1
-# sets the element at i'th index of the list
-List\set(i: Int, v: a) -> a =
-  todo
-# returns the no of elements in the list
-List\length() -> a =
-  self.size
-# adds the specified elements to the start of the list
-List\add(values: ...V) =
-  for v in values
-    l.head = Node(value: v, prev: Nil, next: l.head)
-    l.head.next.prev = l.head
-    l.size += 1
-# removes the element at i'th index of the list
-List\removeAt(i: Int) =
-  l.tail?.prev?.next = Nil
-  # old tail node gets deallocated due to zero reference count
-  l.tail = list.tail?.prev
-  l.size -= 1
-# removes the element v from list
-List\remove(v: a) =
-  l.tail?.prev?.next = Nil
-  # old tail node gets deallocated due to zero reference count
-  l.tail = list.tail?.prev
-  l.size -= 1
-# removes all objects from this list
-List\clear() =
-  l.tail?.prev?.next = Nil
-  # old tail node gets deallocated due to zero reference count
-  l.tail = list.tail?.prev
-  l.size -= 1
-# returns a new list with the elements in reverse order.
-List\reverse(v: fn(v: a) -> Bool) -> List[A] =
-  todo
-# returns a new list with the elements sorted by sorter
-List\sort(sorter: fn(v: a) -> Bool) -> List(A) =
-  todo
-# returns an item and index in the list if the item is is equal to search item
-List\find(search: V): V | Nil =
-  todo
-# returns the index of an item in the list if present and comparable otherwise Nil
-List\contains(v: a) -> Bool =
-  todo
-# calls f for each elem in the list
-List\each(cb: fn(v: a)) -> Unit =
-  current := l.head
-  while current != Nil
-    cb(current.value)
-    current = current.next
-# returns a list made up of B elements for each elem in the list
-List\map(cb: fn(v: a) -> b) -> List(b) =
-  nl := []
-  current := l.head
-  while current != Nil
-    item := cb(current.value)
-    nl.push(item)
-  nl
-# returns a new list with all elements shuffled`
-List\flatMap() =
-  todo
-# returns a new list with the elements that matched the predicate
-List\retain(predicate: fn(v: a) -> A) -> List(A) =
-  todo
-# returns a new list with the elements that matched the predicate removed
-List\reject(predicate: fn(v: a) -> A) -> List(A) =
-  todo
-# returns true if any element in the list satisfies the predicate
-List\any(predicate: fn(v: a) -> Bool) -> Bool =
-  todo
-# returns true if all of the elements in the list satisfies the predicate
-List\every(predicate: fn(v: a) -> Bool) -> Bool =
-  todo
-# returns the accumulated value of all the elements in the list
-List\reduce[B](acc: B, cb: fn(v: a) -> A): B =
-  todo
-# returns the first element in the list
-List\first() -> a | Nil =
-  l.head?.value
-# returns the last element in the list
-List\last() -> a | Nil =
-  l.tail?.value
-# returns a list containing the first n elements of the given list
-List\sublist(start: int, end: int) -> List(A) =
-  todo
-# returns a list containing the first n elements of the given list
-List\take(n: int) -> List(A) =
-  todo
-# returns a list containing the first n elements of the given list
-List\skip(n: int) -> List(A) =
-  todo
-`Returns a list containing the first n elements of the given list
-List\drop(n: int) -> List(A) =
-  todo
-# returns a new list with some of the elements taken randomly`
-List\sample() =
-  todo
-# returns a new list with all elements shuffled`
-List\shuffle() =
-  todo
-# returns a new list with all elements shuffled`
-List\partition() =
-  todo
-# returns a new list with all elements shuffled`
-List\chunk() =
-  todo
-# returns a new list with all elements grouped`
-List\groupBy() =
-  todo
-List\join(sep: Str = ",") -> Str =
-  res := Buffer()
-  l.each() |v|
-    if @HasTrait(V, ToStr)
-      res.write(v.to_str(), sep)
-    else
-      res.write(@TypeToString(v), sep)
-  res.to_str()
+  `returns a list made up of B elements for each elem in the list
+  map(cb: fn(v: a) -> b) -> List(b) =
+    nl := []
+    current := this.head
+    while current != Nil
+      item := cb(current.value)
+      nl.push(item)
+    nl
+  `returns a new list with all elements shuffled`
+  flatMap() =
+    todo
+  `returns a new list with the elements that matched the predicate
+  retain(predicate: fn(v: a) -> a) -> List =
+    todo
+  `returns a new list with the elements that matched the predicate removed
+  reject(predicate: fn(v: a) -> a) -> List =
+    todo
+  `returns true if any element in the list satisfies the predicate
+  any(predicate: fn(v: a) -> Bool) -> Bool =
+    todo
+  `returns true if all of the elements in the list satisfies the predicate
+  every(predicate: fn(v: a) -> Bool) -> Bool =
+    todo
+  `returns the accumulated value of all the elements in the list
+  reduce[B](acc: B, cb: fn(v: a) -> a): B =
+    todo
+  `returns the first element in the list
+  first() -> Option[a] =
+    this.head?.value
+  `returns the last element in the list
+  last() -> Option[a] =
+    this.tail?.value
+  `returns a list containing the first n elements of the given list
+  sublist(start: int, end: int) -> List =
+    todo
+  `returns a list containing the first n elements of the given list
+  take(n: int) -> List =
+    todo
+  `returns a list containing the first n elements of the given list
+  skip(n: int) -> List =
+    todo
+  `returns a list containing the first n elements of the given list
+  drop(n: int) -> List =
+    todo
+  `returns a new list with some of the elements taken randomly`
+  sample() =
+    todo
+  `returns a new list with all elements shuffled`
+  shuffle() =
+    todo
+  `returns a new list with all elements shuffled`
+  partition() =
+    todo
+  `returns a new list with all elements shuffled`
+  chunk() =
+    todo
+  `returns a new list with all elements grouped`
+  groupBy() =
+    todo
+  join(sep: Str = ",") -> Str =
+    res := Buffer()
+    this.each() |v|
+      if @HasTrait(V, ToStr)
+        res.write(v.to_str(), sep)
+      else
+        res.write(@TypeToString(v), sep)
+    res.to_str()

libs/std/map.plum CHANGED Viewed

@@ -27,6 +27,15 @@ Map\get(k: a) -> b | Nil =
       return v
   Nil
+# Get a value from the Map using key k
+Map\get(k: a) -> b | Nil =
+  found : Option(b) = None
+  for k, v in items do
+    if k == k
+      found = v
+      break
+  found
 # Put a value into the Map
 Map\set(k: a, v: b) =
   items.add(pair(k, v))

libs/std/str.plum CHANGED Viewed

@@ -1,177 +1,154 @@
 module std/str
-# ToStr defines any data that can be converted to a str
+`ToStr defines any data that can be converted to a str
-ToStr = (
+trait Stringable =
   toStr() -> Str
-)
-```
-A Str is an array of contiguous data stored in memory with a null termination using hex 0x00 or ASCII 0x00.
-It is immutable and cannot be modified. It is copied for any changes and saved to a new memory location.
-The previous str is freed if its reference count is 0 within the block.
-```
-Str : Comparable + ToStr = {
-  data: Buffer
-}
-Str\get(i: Int) -> Char =
-  data.get(i)
-Str\contains(search: Str) -> Bool =
-  todo
+`A Str is an array of contiguous data stored in memory with a null termination using hex 0x00 or ASCII 0x00.
+`It is immutable and cannot be modified. It is copied for any changes and saved to a new memory location.
-Str\indexOf(sub: Str) -> Int =
+`The previous str is freed if its reference count is 0 within the block.
-  todo
-Str\test(pattern: Regex) -> Bool =
+type Str is Comparable, Stringable, Readable, Writable =
-  todo
+  data: Buffer
-Str\search(key: Str) -> (Int, Bool) =
-  low, mid, high = 0, 0, n.numItems
-  while low < high
+  get(i: Int) -> Char =
-    mid = (low + high) / 2
-    cmp = key > n.items[mid].key
-    low = cmp > 0 ? mid + 1 : low
-    high = cmp < 0 ? mid : high
-    if cmp == 0 then
-      return (mid, True)
-  (low, False)
+    data.get(i)
-Str\startsWith(search: str) -> Bool =
+  contains(self, search: Str) -> Bool =
-  todo
+    todo
-Str\concat(other: Str) -> Str =
+  indexOf(self, sub: Str) -> Int =
-  s + other
+    todo
-Str\toStr() -> Str =
+  test(self, pattern: Regex) -> Bool =
-  self
+    todo
-Str\matchPattern(pattern: Regex) -> List<Str> =
+  search(key: Str) -> (Int, Bool) =
+    low, mid, high = 0, 0, n.numItems
+    while low < high
+      mid = (low + high) / 2
+      cmp = key > n.items[mid].key
+      low = cmp > 0 ? mid + 1 : low
+      high = cmp < 0 ? mid : high
+      if cmp == 0 then
+        return (mid, True)
-  todo
+    (low, False)
-Str\matchAll(pattern: Regex) -> List<Str> =
+  startsWith(search: str) -> Bool =
-  todo
+    todo
-Str\padStart(sub: Str, count: Int) -> Str =
+  concat(other: Str) -> Str =
-  todo
+    s + other
-Str\padEnd(sub: Str, count: Int) -> Str =
+  toStr(self) -> Str =
-  todo
+    self
-Str\repeat(count: Int) -> Str =
+  matchPattern(self, pattern: Regex) -> List<Str> =
-  todo
+    todo
-Str\replace(pattern: Regex, sub: Str) -> Str =
+  matchAll(self, pattern: Regex) -> List<Str> =
-  todo
+    todo
-Str\replaceAll(pattern: Regex, sub: Str) -> Str =
+  padStart(self, sub: Str, count: Int) -> Str =
-  todo
+    todo
-Str\search(pattern: Regex) -> Str =
+  padEnd(self, sub: Str, count: Int) -> Str =
-  todo
+    todo
-Str\slice(start: Int, e: Int) -> Str =
+  repeat(self, count: Int) -> Str =
-  todo
+    todo
-Str\split(separator: Str, limit: Int) -> []Str =
+  replace(pattern: Regex, sub: Str) -> Str =
-  todo
+    todo
-Str\sub(start: Int, e: Int) -> Str =
+  replaceAll(pattern: Regex, sub: Str) -> Str =
-  todo
+    todo
-Str\toLower() -> Str =
+  search(pattern: Regex) -> Str =
-  todo
+    todo
-`reverses a Str
-Str\reverse() -> Str =
+  slice(start: Int, e: Int) -> Str =
-  start := 0
-  end := length - 1
-  result := []
-  while start < end
-    const temp = data[start]
-    result[start] = data[end]
-    result[end] = temp
-    end = end - 1
-    start = start + 1
-  result
+    todo
-Str\parseInt() -> Int =
+  split(separator: Str, limit: Int) -> []Str =
-  0
+    todo
-Str\parseFloat() -> Float =
+  sub(start: Int, e: Int) -> Str =
-  0.0
+    todo
-Str\parseBool() -> Bool =
+  toLower() -> Str =
-  match self.to_lower()
-    "true" -> True
-    "false" -> False
-    _ -> error("could not parse bool '${this}'")
-  if self.lower() == "true"
-    True
+    todo
-  else if self.lower() == "false"
-    False
-  else
-    error("could not parse bool '${this}'")
+  # reverses a Str
+  reverse() -> Str =
+    start := 0
+    end := length - 1
+    result := []
+    while start < end
+      const temp = data[start]
+      result[start] = data[end]
+      result[end] = temp
+      end = end - 1
+      start = start + 1
+    result
-Str\camelCase() -> Str =
+  camelCase() -> Str =
-  todo
+    todo
-Str\snakeCase() -> Str =
+  snakeCase() -> Str =
-  todo
+    todo
-Str\capitalize() -> Str =
+  capitalize() -> Str =
-  todo
+    todo
-Str\kebabCase() -> Str =
+  kebabCase() -> Str =
-  todo
+    todo
-Str\lowerCase() -> Str =
+  lowerCase() -> Str =
-  todo
+    todo
-Str\lowerFirst() -> Str =
+  lowerFirst() -> Str =
-  todo
+    todo
-Str\upperCase() -> Str =
+  upperCase() -> Str =
-  todo
+    todo
-Str\upperFirst() -> Str =
+  upperFirst() -> Str =
-  todo
+    todo
-Str\startCase() -> Str =
+  startCase() -> Str =
-  todo
+    todo
-Str\deburr() -> Str =
+  deburr() -> Str =
-  todo
+    todo
-Str\escape() -> Str =
+  escape() -> Str =
-  todo
+    todo
-Str\escapeRegExp() -> Str =
+  escapeRegExp() -> Str =
-  todo
+    todo
-Str\pad() -> Str =
+  pad() -> Str =
-  todo
+    todo
-Str\template() -> Str =
+  template() -> Str =
-  todo
+    todo
-Str\trim() -> Str =
+  trim() -> Str =
-  todo
+    todo
-Str\trimEnd() -> Str =
+  trimEnd() -> Str =
-  todo
+    todo
-Str\trimStart() -> Str =
+  trimStart() -> Str =
-  todo
+    todo
-Str\truncate() -> Str =
+  truncate() -> Str =
-  todo
+    todo
-Str\unescape() -> Str =
+  unescape() -> Str =
-  todo
+    todo
-Str\words() -> Str =
+  words() -> Str =
-  todo
+    todo

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

@@ -65,13 +65,13 @@ module.exports = grammar({
       seq(
         optional(seq("module", $.module)),
         repeat($.import),
-        repeat(choice($.record, $.object, $.trait, $.enum, $.fn)),
+        repeat(choice($.record, $.trait, $.enum, $.fn)),
       ),
-    module: ($) => $.identifier,
+    module: ($) => $.var_identier,
     import: ($) => seq("import", $.url),
-    url: ($) => sep1(/[a-zA-Z_][a-zA-Z_0-9]*/, "/"),
+    url: () => sep1(/[a-zA-Z_][a-zA-Z_0-9]*/, "/"),
     generics: ($) => seq("(", commaSep1($.generic_type), ")"),
     generic_type: ($) =>
@@ -80,7 +80,7 @@ module.exports = grammar({
       choice(
         seq(
           $.type_identifier,
-          field("generics", optional(seq("(", commaSep1($.type), ")"))),
+          field("generics", optional(seq("[", commaSep1($.type), "]"))),
         ),
         $.generic,
       ),
@@ -88,24 +88,19 @@ module.exports = grammar({
     record: ($) =>
       seq(
+        "type",
         field("name", $.type_identifier),
         field("implements", optional(seq(":", sep1($.type_identifier, "+")))),
         field("generics", optional($.generics)),
         "=",
-        field("fields", seq("{", $._newline, sep1($.record_field, $._newline), $._newline, "}")),
-      ),
-    record_field: ($) =>
-      seq(field("name", $.identifier), ":", field("type", $.type)),
-    object: ($) =>
-      seq(
-        "object",
+        $._indent,
-        field("name", $.type_identifier),
+        optional(repeat($.record_field)),
-        field("implements", optional(seq(":", commaSep1($.type_identifier)))),
-        field("body", optional(seq("{", repeat($.fn), "}"))),
+        optional(repeat($.method)),
+        $._dedent,
       ),
+    record_field: ($) => seq(field("name", $.identifier), ":", field("type", $.type)),
+    method: ($) => alias($.fn, "method"),
     trait: ($) =>
       seq(
         "trait",
@@ -125,7 +120,7 @@ module.exports = grammar({
     param: ($) =>
       seq(
-        field("name", $.identifier),
+        field("name", $.var_identier),
         ":",
         field("type", choice($.type, $.variadic_type)),
         optional(seq("=", field("value", $.expression))),
@@ -136,10 +131,12 @@ module.exports = grammar({
     enum: ($) =>
       seq(
+        "enum",
         field("name", $.type_identifier),
         "=",
         $._indent,
-        field("fields", sep1($.enum_field, $._newline)),
+        optional(repeat($.enum_field)),
+        optional(repeat($.method)),
         $._dedent,
       ),
@@ -152,10 +149,10 @@ module.exports = grammar({
     fn: ($) =>
       seq(
-        field("name", choice($.fn_identifier, $.method_identifier, $.static_identifier)),
+        field("name", choice($.identifier, $.static_identifier)),
         field("params", seq("(", optional(commaSep1($.param)), ")")),
         field("returns", optional(seq("->", $.return_type))),
-        field("body", seq("=", $.body)),
+        field("body", seq("=", choice($.expression, $.body))),
       ),
     body: ($) => seq($._indent, repeat($._statement), $._dedent),
@@ -178,7 +175,7 @@ module.exports = grammar({
     assign: ($) =>
       prec.right(
         seq(
-          field("left", commaSep1($.identifier)),
+          field("left", commaSep1($.var_identier)),
           "=",
           field("right", $.expression),
         ),
@@ -207,12 +204,9 @@ module.exports = grammar({
     reference: ($) =>
       prec(
         PREC.call,
-        seq(choice($.identifier, $.type_identifier), optional(seq(".", $.identifier))),
+        seq(choice($.var_identier, $.type_identifier), optional(seq(".", $.identifier))),
       ),
-    method_identifier: ($) =>
-      seq($.type_identifier, "\\", $.fn_identifier),
     static_identifier: ($) =>
       seq($.type_identifier, "::", $.fn_identifier),

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/corpus/assign.txt CHANGED Viewed

@@ -99,6 +99,8 @@ countriesList = listOf("US", "INDIA", "CANADA")
 a = list.of(1, 2, 3)
 b = list.of(list.of(1), list.of(2), list.of(3))
 c = list.of(1, 2, 3 * 4, 8, n)
+d = "{name} {age}"
+e = "Cat<{fullname()}, {age}>"
 --------------------------------------------------------------------------------
@@ -219,13 +221,13 @@ c = list.of(1, 2, 3 * 4, 8, n)
 assign - Call map
 ================================================================================
-countryCode = mapOf(
+countryCode = Map(
   "in" => "INDIA",
   "us" => "United States",
   "ca" => "Canada"
 )
-a = mapOf("a" => 1, "b" => 2)
+a = Map("a" => 1, "b" => 2)
-b = mapOf("a" => 1, "b" => map.of("c" => 3, "d" => 4))
+b = Map("a" => 1, "b" => Map("c" => 3, "d" => 4))
 --------------------------------------------------------------------------------

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

@@ -2,10 +2,13 @@
 enum
 ================================================================================
-Bool =
+enum Bool
   | True
   | False
+  toStr() -> Str =
+    "Bool"
 --------------------------------------------------------------------------------
 (source
@@ -14,4 +17,14 @@ Bool =
     (enum_field
       (type_identifier))
     (enum_field
-      (type_identifier))))
+      (type_identifier))
+    (method
+      (identifier)
+      (return_type
+        (type_identifier))
+      (body
+        (primary_expression
+          (string
+            (string_start)
+            (string_content)
+            (string_end)))))))

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

@@ -2,20 +2,35 @@
 type - definition
 ================================================================================
-Cat : ToStr = {
+type Cat is Stringable =
   name: Str
   age: Int
-}
-Dog = {
+type Dog =
   name: a
   age:  b
-}
-Dog(a: Compare + String, b) = {
+type Dog(a: Compare + Stringable, b) is Stringable =
   name: a
   age:  b
+type Int =
+  add(other: Int) -> Int = this + other
+  sub(other: Int) -> Int = this - other
+type Cat is Stringable =
+  name: Str
-}
+  age: Int
+  withName(name: Str) -> Cat =
+    Cat(name = name, age = 0)
+  withAge(age: Int) -> Cat =
+    Cat(name = "", age = age)
+  Stringable() -> Str =
+    "Cat"
 --------------------------------------------------------------------------------
 (source
@@ -54,32 +69,39 @@ Dog(a: Compare + String, b) = {
     (record_field
       (identifier)
       (type
-        (b)))))
+        (b))))
+  (record
-================================================================================
+    (type_identifier)
-type - methods
+    (method
-================================================================================
-Cat : ToStr = {
-  name: Str
+      (identifier)
-  age: Int
-}
-Cat\withName(name: Str) -> Cat =
-  Cat(name = name, age = 0)
-Cat\withAge(age: Int) -> Cat =
-  Cat(name = "", age = age)
-Cat\fullname() -> Str =
-  "${name} ${age}"
-Cat\toStr() -> Str =
-  "Cat<{fullname()}, {age}>"
---------------------------------------------------------------------------------
-(source
+      (param
+        (var_identier)
+        (type
+          (type_identifier)))
+      (return_type
+        (type_identifier))
+      (expression
+        (primary_expression
+          (binary_operator
+            (primary_expression
+              (this))
+            (primary_expression
+              (identifier))))))
+    (method
+      (identifier)
+      (param
+        (var_identier)
+        (type
+          (type_identifier)))
+      (return_type
+        (type_identifier))
+      (expression
+        (primary_expression
+          (binary_operator
+            (primary_expression
+              (this))
+            (primary_expression
+              (identifier)))))))
   (record
     (type_identifier)
     (type_identifier)
@@ -88,82 +110,64 @@ Cat\toStr() -> Str =
       (type
         (type_identifier)))
     (record_field
-      (identifier)
-      (type
-        (type_identifier))))
-  (fn
-    (method_identifier
-      (type_identifier)
-      (fn_identifier))
-    (param
       (identifier)
       (type
         (type_identifier)))
-    (return_type
-      (type_identifier))
-    (body
+    (method
-      (primary_expression
-        (type_call
-          (type_identifier)
-          (argument_list
-            (keyword_argument
-              (identifier)
-              (expression
-                (primary_expression
-                  (identifier))))
-            (keyword_argument
-              (identifier)
-              (expression
-                (primary_expression
-                  (integer)))))))))
-  (fn
-    (method_identifier
-      (type_identifier)
-      (fn_identifier))
-    (param
       (identifier)
-      (type
-        (type_identifier)))
-    (return_type
-      (type_identifier))
-    (body
-      (primary_expression
-        (type_call
-          (type_identifier)
-          (argument_list
-            (keyword_argument
-              (identifier)
-              (expression
-                (primary_expression
-                  (string
-                    (string_start)
-                    (string_end)))))
-            (keyword_argument
-              (identifier)
-              (expression
-                (primary_expression
-                  (identifier)))))))))
-  (fn
-    (method_identifier
-      (type_identifier)
-      (fn_identifier))
-    (return_type
-      (type_identifier))
-    (body
-      (primary_expression
-        (string
-          (string_start)
-          (string_content)
-          (string_end)))))
-  (fn
-    (method_identifier
-      (type_identifier)
-      (fn_identifier))
-    (return_type
-      (type_identifier))
-    (body
-      (primary_expression
-        (string
-          (string_start)
-          (string_content)
-          (string_end))))))
+      (param
+        (var_identier)
+        (type
+          (type_identifier)))
+      (return_type
+        (type_identifier))
+      (body
+        (primary_expression
+          (type_call
+            (type_identifier)
+            (argument_list
+              (keyword_argument
+                (identifier)
+                (expression
+                  (primary_expression
+                    (identifier))))
+              (keyword_argument
+                (identifier)
+                (expression
+                  (primary_expression
+                    (integer)))))))))
+    (method
+      (identifier)
+      (param
+        (var_identier)
+        (type
+          (type_identifier)))
+      (return_type
+        (type_identifier))
+      (body
+        (primary_expression
+          (type_call
+            (type_identifier)
+            (argument_list
+              (keyword_argument
+                (identifier)
+                (expression
+                  (primary_expression
+                    (string
+                      (string_start)
+                      (string_end)))))
+              (keyword_argument
+                (identifier)
+                (expression
+                  (primary_expression
+                    (identifier)))))))))
+    (method
+      (identifier)
+      (return_type
+        (type_identifier))
+      (body
+        (primary_expression
+          (string
+            (string_start)
+            (string_content)
+            (string_end)))))))

tooling/vscode-plum/syntaxes/plum.tmLanguage.json CHANGED Viewed

@@ -26,7 +26,7 @@
       "patterns": [
         {
           "name": "keyword.control.plum",
-          "match": "\\b(do|in|this|return|continue|break|match|if|else|while|for|module|as|is|import|assert|todo|crash)\\b"
+          "match": "\\b(module|import|trait|type|enum|fn|in|this|return|continue|break|match|if|else|while|for|as|is|assert|crash|todo)\\b"
         },
         {
           "name": "keyword.operator.arrow.plum",
@@ -85,22 +85,7 @@
       "patterns": [
         {
           "name": "comment.line.plum",
-          "match": "#.*"
+          "match": "`.*"
-        },
-        {
-          "begin": "```",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.begin.plum"
-            }
-          },
-          "end": "```",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.end.plum"
-            }
-          },
-          "name": "comment.block.plum"
         }
       ]
     },

~repos /plum

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

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