plum

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

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

5de508e7 — pyrossh

changes

Files changed (22) hide show

libs/std/bool.plum +19 -36
libs/std/{encode/base64.plum → encoding/Base64.plum} +41 -66
libs/std/err.plum +3 -4
libs/std/float.plum +24 -24
libs/std/http.plum +20 -21
libs/std/json.plum +88 -84
libs/std/option.plum +2 -7
libs/std/result.plum +11 -2
test/add.plum +4 -3
test/aoc_2020_1.plum +2 -2
test/aoc_2020_2.plum +2 -3
test/sample.plum +183 -115
tooling/tree-sitter-plum/grammar.js +19 -11
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/assert.txt +1 -1
tooling/tree-sitter-plum/test/corpus/enum.txt +5 -4
tooling/tree-sitter-plum/test/corpus/if.txt +1 -1
tooling/tree-sitter-plum/test/corpus/match.txt +1 -52
tooling/tree-sitter-plum/test/corpus/type.txt +28 -49
tooling/vscode-plum/syntaxes/plum.tmLanguage.json +42 -2

libs/std/bool.plum CHANGED Viewed

@@ -1,57 +1,40 @@
 module std
-type Int =
+type Int
-  add(b: Int) -> Int = this + b
-  sub(b: Int) -> Int = this - b
+fn (i: Int) add(b: Int) -> Int =
+  return this + b
+fn (i: Int) sub(b: Int) -> Int =
+  return this - b
 enum Bool =
   | True
   | False
+  fromStr(s: Str) -> Result[Bool, Err] =>
+    if s == "true"
+      True
+    else if s == "false"
+      False
+    else
+      Err("could not parse bool from '{s}'")
-  and(other: Bool) -> Bool =
+  and(self, o: Bool) -> Bool =>
-    match this, other
+    match this, o
       True, True => True
       True, False => False
       False, True => False
       False, False => False
-  or(other: Bool) -> Bool =
+  or(self, o: Bool) -> Bool =>
-    match this, other
+    match this, o
       True, True => True
       True, False => True
       False, True => True
       False, False => False
-  toStr() -> Str =
+  toStr(self) -> Str =>
     match this
       True => "True"
       False => "False"
-  fromStr(s: Str) -> Result(Bool, Err) =
-    if s == "true"
-      True
-    else if s == "false"
-      False
-    else
-      Err("could not parse bool from '{s}'")
-readFile() -> Result(String, Err) =
-  return Err
-data = try readFile()
-if Ok(d) = readFile()
-  println(d)
-match readFile()
-  Ok(d) =>
-    printLn(d)
-  Err(e) =>
-    printErr(e)
-enum List =
-  | Empty
-  | Node(a)
-  add() =

libs/std/{encode/base64.plum → encoding/Base64.plum} RENAMED Viewed

@@ -1,39 +1,20 @@
-```
-# Base64 package
-The Base64 package contains support for doing Base64 binary-to-text encodings.
+`The Base64 package contains support for doing Base64 binary-to-text encodings.
-We currently have support 3 encodings: PEM, MIME and URL.
-To learn more about Base64, we suggest you check out the
-[wikipedia entry](https://en.wikipedia.org/wiki/Base64).
-## Example code
-use "encode/base64"
-actor Main
-  new create(env: Env) =>
-    env.out.print(Base64.encode("foobar"))
-    try
-      env.out.print(Base64.decode[String iso]("Zm9vYmFy")?)
-    end
-```
-module base64
+module Base64
-# Encode for PEM (RFC 1421).
+`Encode for PEM (RFC 1421).
 encodePEM(data: ReadSeq[U8]) -> String =
   encode(data, '+', '/', '=', 64)
-# Encode for MIME (RFC 2045).
+`Encode for MIME (RFC 2045).
 encodeMIME(data: ReadSeq[U8]) -> String =
   encode(data, '+', '/', '=', 76)
-# Encode for URLs (RFC 4648). Padding characters are stripped by default.
+`Encode for URLs (RFC 4648). Padding characters are stripped by default.
 encodeURL(data: ReadSeq[U8], pad: Bool = False) -> String =
   let c: U8 = if pad then '=' else 0 end
   encode[A](data, '-', '_', c)
-# Configurable encoding. The defaults are for RFC 4648.
+`Configurable encoding. The defaults are for RFC 4648.
 encode(
   data: ReadSeq[U8],
   at62: U8 = '+',
@@ -96,32 +77,21 @@ encode(
     out.clear()
   out
-  fun decode_url[A: Seq[U8] iso = Array[U8] iso](data: ReadSeq[U8]): A^ ? =>
-    """
-    Decode for URLs (RFC 4648).
+  `Decode for URLs (RFC 4648).
-    """
+  decode_url(data: ReadSeq[U8]) -> Option[A] =
     decode[A](data, '-', '_')?
-  fun decode[A: Seq[U8] iso = Array[U8] iso](
-    data: ReadSeq[U8],
-    at62: U8 = '+',
-    at63: U8 = '/',
-    pad: U8 = '=')
-    : A^ ?
-  =>
-    """
-    Configurable decoding. The defaults are for RFC 4648. Missing padding is
+  `Configurable decoding. The defaults are for RFC 4648. Missing padding is
-    not an error. Non-base64 data, other than whitespace (which can appear at
+  `not an error. Non-base64 data, other than whitespace (which can appear at
-    any time), is an error.
+  `any time), is an error.
-    """
+  decode(data: ReadSeq[U8], at62: U8 = '+', at63: U8 = '/', pad: U8 = '=') -> Option[A] =
-    let len = (data.size() * 4) / 3
+    len = (data.size() * 4) / 3
-    let out = recover A(len) end
+    out = recover A(len) end
-    var state = U8(0)
+    state = U8(0)
-    var input = U8(0)
+    input = U8(0)
-    var output = U8(0)
+    output = U8(0)
-    for i in Range(0, data.size()) do
+    for i in Range(0, data.size())
       input = data(i)?
       let value =
@@ -170,23 +140,12 @@ encode(
     out
-# Encode a single byte
-encodeByte(i: Byte, at62: Byte, at63: Byte) -> Byte =
-  match
-    i == 62 => at62
-    i == 63 => at63
-    i < 26 => 'A' + i
-    i < 52 => ('a' - 26) + i
-    i < 62 => ('0' - 52) + i
-# Test base64 encoding.
-# Using test examples from RFC 4648.
+test "encode and decode" =>
-encodeDecodeTest() =
-  assert
+  expect:
     encode(a) == b
     decode(b) == a
   where:
-    a         | b
+    a         | b
     ""        | ""
     "f"       | "Zg=="
     "fo"      | "Zm8="
@@ -195,5 +154,21 @@ encodeDecodeTest() =
     "fooba"   | "Zm9vYmE="
     "foobar"  | "Zm9vYmFy"
+encodeByte(i: Byte, at62: Byte, at63: Byte) -> Byte =
-# a | b | c << sql.rows("select a, b, c from maxdata")
+  doc: "encode a single byte"
+  match i
+    i == 62 => at62
+    i == 63 => at63
+    i < 26 => 'A' + i
+    i < 52 => ('a' - 26) + i
+    i < 62 => ('0' - 52) + i
+  check:
+    expect:
+      encodeByte(i, at62, at63) == b
+    where:
+      i   | at62 | at63
+      1   | 0    | 0
+      2   | 0    | 0
+      3   | 0    | 0
+      62  | 0    | 0
+      63  | 0    | 0

libs/std/err.plum CHANGED Viewed

@@ -1,8 +1,7 @@
 module std
-# This is used to represent an error value across the language
+`This is used to represent an error value across the language
-Err = (
+trait Err =
   code() -> Int
   msg() -> Str
-  cause() -> Err | Nil
+  cause() -> Err | Nil
-)

libs/std/float.plum CHANGED Viewed

@@ -1,24 +1,24 @@
 module std
 type Float =
-  E = 2.718f  # Euler's number, the base of natural logarithms, e, https://oeis.org/A001113
+  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
+  LN10 = 2.302f `The natural logarithm of 10, https://oeis.org/A002392
-  LN2 = 0.693f # The natural logarithm of 2 https://oeis.org/A002162
+  LN2 = 0.693f `The natural logarithm of 2 https://oeis.org/A002162
-  LOG10E = 0.434f # The base 10 logarithm of e # formula: 1 / LN10
+  LOG10E = 0.434f `The base 10 logarithm of e `formula: 1 / LN10
-  LOG2E = 1.442f # The base 2 logarithm of e # formula: 1 / LN2
+  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
+  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
+  PHI = 1.6180f `https://oeis.org/A001622
-  SQRT1_2 = 0.707f # The square root of 1/2
+  SQRT1_2 = 0.707f `The square root of 1/2
-  SQRT2 = 1.414f # The square root of 2 https://oeis.org/A002193
+  SQRT2 = 1.414f `The square root of 2 https://oeis.org/A002193
-  SQRT_E = 1.64872f # https://oeis.org/A019774
+  SQRT_E = 1.64872f `https://oeis.org/A019774
-  SQRT_PI  = 1.77245f # https://oeis.org/A002161
+  SQRT_PI  = 1.77245f `https://oeis.org/A002161
-  SQRT_PHI = 1.27201f # https://oeis.org/A139339
+  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
+  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
+  MIN_FLOAT_VALUE = 4.9406564584124654417656879286822137236505980e-324 `Lowest value of float
-  MAX_FLOAT_VALUE = 1.79769313486231570814527423731704356798070e+308   # Highest value of float
+  MAX_FLOAT_VALUE = 1.79769313486231570814527423731704356798070e+308   `Highest value of float
-  ::fromStr(s: Str) -> Result(Float, Err) =
+  static fromStr(s: Str) -> Result(Float, Err) =
     todo
   acosh(v: Float) -> Float =
@@ -31,19 +31,19 @@ type Float =
         t =
         ((2*t+t*t).sqrt() + t).log1p() 2 >= x > 1
-  # Check whether this number is finite, ie not +/-infinity and not NaN.
+  `Check whether this number is finite, ie not +/-infinity and not NaN.
-  # True if exponent is not all 1s
+  `True if exponent is not all 1s
   isFinite() -> Bool =
     (bits() && 0x7FF0_0000_0000_0000) != 0x7FF0_0000_0000_0000
-  # Check whether this number is +/-infinity
+  `Check whether this number is +/-infinity
-  # True if exponent is all 1s and mantissa is 0
+  `True if exponent is all 1s and mantissa is 0
   isInfinite() -> Bool =
     ((bits() && 0x7FF0_0000_0000_0000) == 0x7FF0_0000_0000_0000) &&  # exp
     ((bits() && 0x000F_FFFF_FFFF_FFFF) == 0)  # mantissa
-  # Check whether this number is NaN.
+  `Check whether this number is NaN.
-  # 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() && 0x7FF0_0000_0000_0000) == 0x7FF0_0000_0000_0000) &&  # exp
     ((bits() && 0x000F_FFFF_FFFF_FFFF) != 0)  # mantissa

libs/std/http.plum CHANGED Viewed

@@ -4,29 +4,28 @@ import std/path
 import std/os
 import std/http/content_type
-Response = (
+type Response =
-  headers: Map(Str, Str)
+  headers: Map[Str, Str]
   body: Str | Buffer | IO
   status: Int
-)
-createFileResponse(path: Str) -> Response | IOError =
+  createFileResponse(path: Str) -> Response | IOError =
-  content = content_type.fromExt(path.ext())
+    content = content_type.fromExt(path.ext())
-  data = os.readFile(file)?
+    data = os.readFile(file)?
-  Response()
+    Response::create()
-    .header("Content-Type", content)
+      .header("Content-Type", content)
-    .contentType(.ApplicationJS)
+      .contentType(.ApplicationJS)
-    .body(data)
+      .body(data)
-    .status(200)
+      .status(200)
-index() -> Response | IOError =
+  index() -> Response | IOError =
-  createFileResponse("index.html")
+    createFileResponse("index.html")
-serveFile(file: Str) -> Response | IOError =
+  serveFile(file: Str) -> Response | IOError =
-  ext := path::ext(file)
+    ext := path::ext(file)
-  content := contentTypeFromExt(ext)
+    content := contentTypeFromExt(ext)
-  data := os.readFile(file)?
+    data := os.readFile(file)?
-  Response()
+    Response()
-    .header("Content-Type", content)
+      .header("Content-Type", content)
-    .body(data)
+      .body(data)
-    .status(200)
+      .status(200)

libs/std/json.plum CHANGED Viewed

@@ -1,64 +1,97 @@
 module std/json
+import std.{Option, Bool, Float, Str, List, Map, Result}
-Json =
+enum Json =
   | None
-  | Str
   | Bool
   | Float
-  | Int
+  | Str
   | List
   | Map
+  ^parse(src: Readable) -> Result(Json, JsonParseError) =
+    JsonParser.withSrc(src).parse()
-JsonParseError = {
+class JsonParseError(Error) =
   line: Int
   pos: Int
   token: Char
-}
-Json::parse(src: Str | Buffer | IO) -> Json | JsonParseError =
-  JsonParser.withSrc(src).parse()
-Json\parseNone() -> None | JsonParseError =
-  parser.find("null")
-Json\parseStr() -> Str | JsonParseError =
-  parser.find("null")
-Json\parseFloat() -> Float | JsonParseError =
-  parser.find("null")
-Json\parseInt() -> Int | JsonParseError =
-  parser.find("null")
-Json\parseList() -> List | JsonParseError =
-  parser.find("null")
-Json\parseMap() -> Map | JsonParseError =
-  parser.find("null")
-JsonParser = (
-  cur: Int = ' '
-  _pos: Int = 0
-  _next: Int = ' '
-  _buf: Str | Buffer | IO
-)
-JsonParser::withSrc(src: Str | Buffer | IO) -> JsonParser =
-  JsonParser(_buf = src)
-fn isSpace(c: U32): Bool => (c == ' ') or ((c >= '\t') and (c <= '\r'))
-fn isDelim(c: U32): Bool =>
-    (c == ',') || (c == '}') || (c == ':') || (c == ']') || (_is_space(c)) || (c == 0)
+data JsonParser =
+  cur: Int = ""
+  pos: Int = 0
+  next: Int = ""
+  src: Readable
+  ^withSrc(src: Readable) =
+    JsonParser::create()
+      .src(src)
+  parse() -> Result(Json, JsonParseError) =
+    match getNext()
+      '{' -> parseObject()
+      '[' -> parseList()
+      `"` -> parseStr()
+      'n' -> parseNone()
+      `t` | `f` -> parseBool()
+      0..9 -> parseFloat()
+      _ -> Err(createErr())
+  createErr() =
+    JsonParseError::create()
+      .line(0)
+      .pos(pos)
+      .token(cur)
+  parseNone() -> Result[None, JsonParseError] =
+    find("null")
+    check:
+      assert Json.parse("null") == None
+  parseBool() -> Result[Bool, JsonParseError] =
+    if find("true")
+      True
+    else if find("false")
+      False
+    check:
+      assert Json.parse("true") == True
+      assert Json.parse("false") == False
+  parseStr() -> Result[Str, JsonParseError] =
+    find("null")
+    check:
+      assert Json.parse(`"hello"`) == "hello"
+  parseFloat() -> Result[Float, JsonParseError] =
+    find("null")
+  parseInt() -> Result[Int, JsonParseError] =
+    find("Int")
+    check:
+      assert Json.parse("123") == 123
+  parseList() -> Result[List, JsonParseError] =
+    find("null")
+    check:
+      assert Json.parse("[]") == List[Json]()
+      assert Json.parse("[1, 2]") == List[Json](1, 2)
+  parseMap() -> Result[Map, JsonParseError] =
+    find("null")
+    check:
+      assert Json.parse("{}") == Map[Str, Json]()
+      assert Json.parse(`{"a": 1, "b": 2}`) == Map[Str, Json]("a" => 1, "b" => 2)
+isSpace(c: Int) -> Bool =
+  {c == ' '} || {{c >= '\t'} && {c <= '\r'}}
+isDelim(c: Int) -> Bool =
+  (c == ',') || (c == '}') || (c == ':') || (c == ']') || (_is_space(c)) || (c == 0)
-fn isDigit(c: U32) -> Bool {
+isDigit(c: Int) -> Bool =
-  return (c >= '0') && (c <= '9')
+  (c >= '0') && (c <= '9')
-}
-fn _is_digit(c: U32): Bool => (c >= '0') and (c <= '9')
-fn (p: Parser) _err(msg: str) => printLn(msg)
 fn _get_next_raw(): U32 =>
   try
@@ -94,16 +127,10 @@ fn _expect(chr: U32, msg: String): Bool =>
 fn _inc_pos(i: ISize = 1) => _pos = _pos.add(i)
-fn (p JsonParser) parse(): Json =
-  match parser.get_next()
-    '{' -> p.parseObject()
-    '[' -> p.parseList()
-    _ -> nil
 fn (p JsonParser) parseObject(): Map[str, Json] =
   object := Map[str, Json]()
-  p._get_next() // '{'
+  p.getNext() # '{'
-  while true
+  while True
     if p.cur != '"'
       p._err("JSON: Object: expected '\"'\n")
       break
@@ -113,7 +140,7 @@ fn (p JsonParser) parseObject(): Map[str, Json] =
       break
     val_val := Json(nil)
-    when p.cur
+    match p.cur
       '{' ->
         val_val = parse_object(p)
         p._expect('}', "JSON: Object: expected '}'\n")
@@ -175,9 +202,9 @@ fn (p: Parser) parseUtf16(): int =
     p._get_next_raw()
     if _is_digit(cur)
       result = ((result << 4) or (cur - '0').i32())
-    else if (cur >= 'a') and (cur <= 'f')
+    else if {cur >= 'a'} && {cur <= 'f'}
       result = ((result << 4) or ((cur - 'a').i32() + 10))
-    else if (cur >= 'A') and (cur <= 'F')
+    else if (cur >= 'A') && (cur <= 'F')
       result = ((result << 4) or ((cur - 'A').i32() + 10))
     count = count+1
   result
@@ -345,27 +372,4 @@ fn _get_fals(): bool? =
       false
   else
       error
-  end
+  end
-Json\test("parseInt") =
-  assert Json.parse("123") == 123
-Json\test("parseStr") =
-  assert Json.parse(`"hello"`) == "hello"
-Json\test("parseBool") =
-  assert Json.parse("true") == true
-  assert Json.parse("false") == false
-Json\test("parse null") =
-  assert Json.parse("null") == nil
-Json\test("parse array") =
-  assert Json.parse(`[]`) == List[Json]()
-  assert Json.parse(`[1, 2]`) == List.of[Json](1, 2)
-Json\test("parse object") =
-  assert Json.parse(`{}`) == Map[str, Json]()
-  assert Json.parse(`{"a": 1, "b": 2}`) == Map.of[str, Json]("a" => 1, "b" => 2)

libs/std/option.plum CHANGED Viewed

@@ -1,12 +1,7 @@
 module std
-import std.{
+import std.{Int, Str, Result, Option}
-  Int,
-  Str,
-  Result,
-  Option
-}
-type Option =
+enum Option =
   | Some(a)
   | None

libs/std/result.plum CHANGED Viewed

@@ -1,6 +1,15 @@
 module std
-type Result =
+enum Result =
   | Ok(a)
   | Err(b)
+  isOk() -> Bool =
+    doc: "Checks whether the result is an `Ok` value"
+    if Ok(_) == this
+      True
+    else if Err(_) = this
+      False
+    check:
+      Ok("data").isOk() == True
+      Err("no data").isOk() == False

test/add.plum CHANGED Viewed

@@ -5,7 +5,7 @@ import fs
 add(a: Int, b: Int) -> Int =
   a + b
-give_42() -> Int =
+give42() -> Int =
   42
 main() -> Int =
@@ -61,8 +61,9 @@ factorial(num: Int) -> Int =
 main() -> Bool
   5.squared() == 25
+extend Int
-Int\squared(): Int =
+  squared() -> Int =
-  self * self
+    this * this
 main() -> Unit =
   input = fs::readFile("./examples/test/demos/aoc2023/1.txt")

test/aoc_2020_1.plum CHANGED Viewed

@@ -11,8 +11,8 @@ main() -> Unit =
         printLn(a * b)
         return
-fn parseNumbers(input: Str) -> List<Int> =
+parseNumbers(input: Str) -> List<Int> =
-  numbers = listOf<Int>()
+  numbers = List<Int>()
   current_number = 0
   for i in 0..input.len()
     c = input.charAt(i)

test/aoc_2020_2.plum CHANGED Viewed

@@ -1,16 +1,15 @@
-Step =
+enum Step =
   | READ_MIN_OCCURANCES = 0
   | READ_MAX_OCCURANCES = 1
   | READ_CHAR_TO_COUNT = 2
   | COUNT_OCCURANCES = 3
-PasswordCheckState = {
+class PasswordCheckState =
   step: Step
   min_occurances: Int
   max_occurances: Int
   current_occurances: Int
   char_to_counst: Int
-}
 initialCheckState() -> PasswordCheckState =
   PasswordCheckState(

test/sample.plum CHANGED Viewed

@@ -1,126 +1,225 @@
 module sample
-import std.{List, Map, Math, Random}
+import std.(List, Map, Math)
+import std/encoding.(Base64)
 Int.random()
 Float.random()
 Float.PI
-User = {
+type Int =
+  random() -> Int = 20
+  add(self, other: Int) -> Int = self + other
+  sub(self, other: Int) -> Int = self - other
+type User(ToStr) =
   name: Str
-  email: Str
+  age: Int
   todos: List(Todo)
-}
+  fromJson(s: Str) -> Result(Self, Err) =
+    v = try Json.parse(s) as Map(Str, Json)
+    User::create()
+      .name(v.get("name").asStr())
+      .email(v.get("email").asStr())
+      .todos(v.get("todos").asList().map(\t ->
+        Todo::create().title(t.get("title").asStr()))
+      )
+  queryAll(self, noise: Int) -> Str =
+    printLn(noise)
-Todo = {
+    ""
+  findOne(self) -> Self =
+    printLn(noise)
+  toStr(self) -> Str =
+    "User({u.name}, {u.age})"
+type Cat(ToStr) =
-  title: Str
+  name: Str
-}
+  age: Int
+  fromJson(s: Str) -> Result(Self, Err) =
+    v = try Json.parse(s) as Map(Str, Json)
+    Cat::create()
+      .name(v.get("name").asStr())
+      .age(v.get("age").asInt())
+  withName(self, name: Str) -> Cat =
+    Cat(name = name, age = self.age)
+  withAge(self, age: Int) -> Cat =
+    Cat(name = self.name, age = age)
+  toStr(self) -> Str =
+    "Cat(1, 2)"
+2.sqrt().sin().cos()
+# Less indentation
-User()
+u = User::create()
   .name("John Doe")
   .email("john@example.com")
-  .todo(Todo().title("Make pizza"))
+  .todos(Todo::create().title("Make pizza"))
-  .todo(Todo().title("Finish Toasty"))
+  .todos(Todo::create().title("Finish Toasty"))
-  .todo(Todo().title("Sleep"))
+  .todos(Todo::create().title("Sleep"))
+# User(
+#   name: "John Doe",
+#   email: "john@example.com",
+#   todos: List(
+#     Todo(title: "Make pizza"),
+#     Todo(title: "Finish Toasty"),
+#     Todo(title: "Sleep"),
+#   )
+# )
+u2 = try User.fromJson(`{
+  "name": "John Doe",
+  "email": "john@example.com",
+  "todos": [
+    {"title": "Make pizza"},
+    {"title": "Finish Toasty"},
+    {"title": "Sleep"}
+  ]
+}`)
-stoplightColor(something: Int) -> Color =
+func stoplightColor(something: Int) -> Color =
   if something > 0
-      Red
+    Red
   else if something == 0
-      Yellow
+    Yellow
   else
-      Green
+    Green
+func toCelsius(f: Float) -> Float =
+  doc: "Convert fahrenheit temperature reading to celsius"
+  return {f - 32} * {5 / 9}
+  check:
+    toCelsius(0) == 32
+    toCelsius(100) == 212
+    toCelsius(100) == 392
+type Response(Reader, Writer) =
+  val body: Buffer = Buffer()
+  val headers: Map(Str, Str) = Map()
+  val status: Int = 0
+  static fn empty() -> Self =
+    Response::create()
+      .body(Buffer())
+      .headers(Map())
+      .status(0)
+  fn createFileResponse(path: Str) -> Result(Response, IOError) =
+    content_type = try Mime::fromExt(path.ext())
+    body = try os.readFile(file)
+    Response::create()
+      .header("Content-Type", content_type)
+      .body(body)
+      .status(200)
+  fn serveFile(file: Str) -> Result(Response, IOError) =
+    ext = try Path::fromExt(file)
+    content_type = try Mime::fromExt(ext)
+    body = os.readFile(file)
+    Response::create()
+      .header("Content-Type", content_type)
+      .body(body)
+      .status(200)
+  fn index() -> Result(Response, IOError) =
+    createFileResponse("index.html")
-Response = {
-  body: Buffer = emptyBuffer()
-  headers: Map(Str, Str) = emptyMap()
+g = Greeter(name: "abc")
-  status: Int = 0
+g = Greeter(...g, name: "123")
-}
-main() -> Unit =
+func readFile() -> Result(String, Err) =
-  printLn("123")
+  return Err("123")
-main() -> Int, Err =
+func main() -> Unit =
+  printLn("123")
+  createFileResponse("./src/sample.plum")
+  index()
-    Stdout.line! "There are $(total) animals."
+  serveFile("./src/sample.plum")
+  content = try readFile()
-# calculate to str
+  if Ok(d) = readFile()
-Int\toStr() -> Str =
-  todo
+    println(d)
+  match readFile()
+    Ok(d) =>
+      printLn(d)
-Int::random() -> Int =
+    Err(e) =>
-  24
+      printErr(e)
-sub(arg1: Int, arg2: Int) -> Int =
+func sub(arg1: Int, arg2: Int) -> Int =
   local1 = arg1
   local2 = arg2
   local1 - local2
-addAndStringify(num1: Int, num2: Int) -> Str =
+func addAndStringify(num1: Int, num2: Int) -> Str =
-  (num1 + num2).toStr()
+  return (num1 + num2).toStr()
-factorial(x: Int) -> Int =
+func factorial(x: Int) -> Int =
   if x < 2
     x
   else
     x * factorial(x - 1)
-Result(a, b) =
- | Ok(a)
- | Err(b)
-```
-Checks whether the result is an `Ok` value
-isOk(Ok(1)) # => True
-isOk(Err(Nil)) # => False
-```
-Result\isOk() -> Bool =
-  r! # will bubble back the result similar to try catch
-  o! # will bubble back the option/result
-  if self == Ok(v) then
-    True
-  else if self == Err(_) then
-    False
-birds = 3
+var birds = 3
-iguanas = 2
+var iguanas = 2
-total = addAndStringify(birds, iguanas)
+var total = addAndStringify(birds, iguanas)
-pluralize(singular: Str, plural: Str, count: Int) -> Str =
+func pluralize(singular: Str, plural: Str, count: Int) -> Str =
   countstr = Num.toStr(count)
   if count == 1 then
     "$(countstr) $(singular)"
   else
     "$(countstr) $(plural)"
-pluralize_test(t: Test) -> Unit =
+func pluralize_test(t: Test) -> Unit =
   assert pluralize("cactus", "cacti", 1) == "1 cactus"
   assert pluralize("cactus", "cacti", 2) == "2 cacti"
-User = {
+type User =
   name: String
   age: String
-}
-user = User(1, 2, 3)
-params = Map("one" => 1, "two" => 2, "three" => 3)
-arr = List(1, 2, 3, 4)
-User\isAuthorized() -> Bool =
+isAuthorized() -> Bool =
   False
-User\map(cb: (a: User) -> b) -> b =
+map(cb: (a: User) -> b) -> b =
   cb(u)
+type Teacher(
+  name: String,
+  subject: String
+)
+user = User(
+  name: "John Doe",
+  age: 30
+)
+params = Map("one" => 1, "two" => 2, "three" => 3)
+arr = List(1, 2, 3, 4)
-name(data: Option(Str)) -> Str =
+func name(d: Option(Str)) -> Str =
-  if data == Some(v) then
+  if d == Some(v) then
     v.subString(0, 3)
   else if a ==  b then
     "123"
   else
     "1231"
-delta(data: Option(Str)) -> Str =
+delta(d: Option(Str)) -> Str =
-  if data == Some(v)
+  if d == Some(v)
     v.subString(0, 3)
   else if a == b
     "123"
@@ -130,20 +229,19 @@ delta(data: Option(Str)) -> Str =
     else
       println("No Data")
-data.price?.takeIf(\a -> a != "")
+d.price?.takeIf(\a -> a != "")
 (1 + 2).mod(3).pow(2).sqrt()
 if v == None
   error.Error
-else if v == Some(c)
+else if Some(c) = v
   c * 20
 match v
   None -> error.Error
   Some(c) -> c * 20
-names = ["Sam", "Lee", "Ari"]
+names = List("Sam", "Lee", "Ari")
 names.append("Jess")
 names.map(\num -> num * 2)
@@ -157,50 +255,20 @@ import std/libc
 extern sqrt(x: libc.Double) -> libc.Double
 extern pow(x: libc.Double, y: libc.Double) -> libc.Double
-WriteError = EOF | Closed
-Writer = (
-	write(p: Str | Buffer) -> Int | WriteError
-)
-ReadError = EOF | Closed
-Reader = (
+trait Writer =
-	read(p: Str | Buffer) -> Int | ReadError
+	write(p: Str | Buffer) -> Result[Int, WriteError]
-)
-IO = Reader + Writer
+enum ReadError =
+  | EOF
-IOError = ReadError | WriteError
+  | Closed
+enum WriteError =
+  | EOF
-Response(
+  | Closed
-  headers: Map[Str, Str]
-  body: Str | Buffer | IO
-  status: Int
-)
-createFileResponse(path: Str) -> Response | IOError =
-  content := content_type.fromExt(path.ext())
-  data := os.readFile(file)?
-  Response()
-    .header("Content-Type", content)
-    .body(data)
-    .status(200)
-index() -> Response =
+trait Reader =
-  createFileResponse("index.html")
-serveFile(file: Str) -> Response | IOError =
+	read(p: Str | Buffer) -> Result[Int, ReadError]
-  ext := path::ext(file)
-  content := contentTypeFromExt(ext)
-  data := os.readFile(file)?
-  Response()
-    .header("Content-Type", content)
-    .body(data)
-    .status(200)
-http.createFileResponse("./src/sample.plum")
-http.index()
-http.serveFile("./src/sample.plum")
-g = Greeter(name: "abc")
+trait IO(Reader, Writer) =
-g = Greeter(...g, name: "123")
+  pass

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

@@ -90,17 +90,22 @@ module.exports = grammar({
       seq(
         "type",
         field("name", $.type_identifier),
-        field("implements", optional(seq(":", sep1($.type_identifier, "+")))),
+        field("implements", optional(seq("(", commaSep1($.type_identifier), ")"))),
         field("generics", optional($.generics)),
         "=",
         $._indent,
-        optional(repeat($.record_field)),
+        field("fields", optional(repeat(alias($.record_field, $.field)))),
-        optional(repeat($.method)),
+        field("methods", optional(repeat($.method))),
         $._dedent,
       ),
     record_field: ($) => seq(field("name", $.identifier), ":", field("type", $.type)),
-    method: ($) => alias($.fn, "method"),
+    method: ($) => seq(
+      field("name", $.identifier),
+      field("params", seq("(", optional(commaSep1($.param)), ")")),
+      field("returns", optional(seq("->", $.return_type))),
+      field("body", seq("=", choice($.expression, $.body))),
+    ),
     trait: ($) =>
       seq(
         "trait",
@@ -119,11 +124,14 @@ module.exports = grammar({
       ),
     param: ($) =>
+      choice(
+        seq("self"),
-      seq(
+        seq(
-        field("name", $.var_identier),
+          field("name", $.var_identier),
-        ":",
+          ":",
-        field("type", choice($.type, $.variadic_type)),
+          field("type", choice($.type, $.variadic_type)),
-        optional(seq("=", field("value", $.expression))),
+          optional(seq("=", field("value", $.expression))),
+        ),
       ),
     return_type: ($) =>
@@ -135,7 +143,7 @@ module.exports = grammar({
         field("name", $.type_identifier),
         "=",
         $._indent,
-        optional(repeat($.enum_field)),
+        optional(repeat(alias($.enum_field, $.field))),
         optional(repeat($.method)),
         $._dedent,
       ),
@@ -513,4 +521,4 @@ function newlineSep1(rule) {
 function sep1(rule, separator) {
   return seq(rule, repeat(seq(separator, rule)));
-}
+}

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

@@ -13,7 +13,7 @@ main() =
 (source
   (fn
-    (fn_identifier)
+    (identifier)
     (body
       (assert
         (expression

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

@@ -2,11 +2,11 @@
 enum
 ================================================================================
-enum Bool
+enum Bool =
   | True
   | False
-  toStr() -> Str =
+  toStr(self) -> Str =
     "Bool"
 --------------------------------------------------------------------------------
@@ -14,12 +14,13 @@ enum Bool
 (source
   (enum
     (type_identifier)
-    (enum_field
+    (field
       (type_identifier))
-    (enum_field
+    (field
       (type_identifier))
     (method
       (identifier)
+      (param)
       (return_type
         (type_identifier))
       (body

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

@@ -19,7 +19,7 @@ main() =
 (source
   (fn
-    (fn_identifier)
+    (identifier)
     (body
       (if
         (expression

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

@@ -15,55 +15,4 @@ main() =
 --------------------------------------------------------------------------------
-(source
-  (test
+()
-    (string
-      (string_start)
-      (string_end))
-    (lambda
-      (identifier)
-      (body
-        (assignment_statement
-          (identifier)
-          (binary_operator
-            (parenthesized_expression
-              (binary_operator
-                (integer)
-                (integer)))
-            (parenthesized_expression
-              (binary_operator
-                (integer)
-                (integer)))))
-        (if_statement
-          (comparison_operator
-            (identifier)
-            (identifier))
-          (block
-            (assert_statement
-              (comparison_operator
-                (identifier)
-                (identifier))))
-          (else_if_clause
-            (comparison_operator
-              (identifier)
-              (integer))
-            (block
-              (assert_statement
-                (comparison_operator
-                  (identifier)
-                  (integer)))))
-          (else_if_clause
-            (comparison_operator
-              (identifier)
-              (integer))
-            (block
-              (assert_statement
-                (comparison_operator
-                  (identifier)
-                  (integer)))))
-          (else_clause
-            (block
-              (assert_statement
-                (comparison_operator
-                  (identifier)
-                  (integer))))))))))

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

@@ -1,79 +1,54 @@
 ================================================================================
-type - definition
+type
 ================================================================================
-type Cat is Stringable =
-  name: Str
-  age: Int
 type Dog =
-  name: a
+  name: Str
-  age:  b
+  age: b
-type Dog(a: Compare + Stringable, b) is Stringable =
-  name: a
-  age:  b
 type Int =
+  random() -> Int = 20
-  add(other: Int) -> Int = this + other
+  add(self, other: Int) -> Int = self + other
-  sub(other: Int) -> Int = this - other
+  sub(self, other: Int) -> Int = self - other
-type Cat is Stringable =
+type Cat(Stringable) =
   name: Str
   age: Int
-  withName(name: Str) -> Cat =
+  withName(self, name: Str) -> Cat =
     Cat(name = name, age = 0)
-  withAge(age: Int) -> Cat =
+  withAge(self, age: Int) -> Cat =
     Cat(name = "", age = age)
-  Stringable() -> Str =
+  toStr(self) -> Str =
-    "Cat"
+    "Cat(1, 2)"
 --------------------------------------------------------------------------------
 (source
   (record
     (type_identifier)
-    (type_identifier)
-    (record_field
+    (field
       (identifier)
       (type
         (type_identifier)))
-    (record_field
+    (field
-      (identifier)
-      (type
-        (type_identifier))))
-  (record
-    (type_identifier)
-    (record_field
-      (identifier)
-      (type
-        (a)))
-    (record_field
       (identifier)
       (type
         (b))))
   (record
     (type_identifier)
-    (generics
-      (a)
-      (type_identifier)
-      (type_identifier)
-      (b))
-    (record_field
-      (identifier)
-      (type
+    (method
-        (a)))
-    (record_field
       (identifier)
-      (type
+      (return_type
-        (b))))
-  (record
-    (type_identifier)
+        (type_identifier))
+      (expression
+        (primary_expression
+          (integer))))
     (method
       (identifier)
+      (param)
       (param
         (var_identier)
         (type
@@ -84,11 +59,12 @@ type Cat is Stringable =
         (primary_expression
           (binary_operator
             (primary_expression
-              (this))
+              (identifier))
             (primary_expression
               (identifier))))))
     (method
       (identifier)
+      (param)
       (param
         (var_identier)
         (type
@@ -99,22 +75,23 @@ type Cat is Stringable =
         (primary_expression
           (binary_operator
             (primary_expression
-              (this))
+              (identifier))
             (primary_expression
               (identifier)))))))
   (record
     (type_identifier)
     (type_identifier)
-    (record_field
+    (field
       (identifier)
       (type
         (type_identifier)))
-    (record_field
+    (field
       (identifier)
       (type
         (type_identifier)))
     (method
       (identifier)
+      (param)
       (param
         (var_identier)
         (type
@@ -138,6 +115,7 @@ type Cat is Stringable =
                     (integer)))))))))
     (method
       (identifier)
+      (param)
       (param
         (var_identier)
         (type
@@ -163,6 +141,7 @@ type Cat is Stringable =
                     (identifier)))))))))
     (method
       (identifier)
+      (param)
       (return_type
         (type_identifier))
       (body

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

@@ -19,6 +19,9 @@
     },
     {
       "include": "#discards"
+    },
+    {
+      "include": "#raw_string_literals"
     }
   ],
   "repository": {
@@ -26,7 +29,7 @@
       "patterns": [
         {
           "name": "keyword.control.plum",
-          "match": "\\b(module|import|trait|type|enum|fn|in|this|return|continue|break|match|if|else|while|for|as|is|assert|crash|todo)\\b"
+          "match": "\\b(self|this|fn|impl|where|extern|func|try|var|val|module|import|trait|type|enum|in|return|continue|break|match|if|else|while|for|as|is|assert|panic)\\b"
         },
         {
           "name": "keyword.operator.arrow.plum",
@@ -67,6 +70,10 @@
         {
           "name": "keyword.operator.assignment.plum",
           "match": "="
+        },
+        {
+          "name": "keyword.operator.comparison.plum",
+          "match": "(<|>)"
         }
       ]
     },
@@ -85,7 +92,7 @@
       "patterns": [
         {
           "name": "comment.line.plum",
-          "match": "`.*"
+          "match": "#.*"
         }
       ]
     },
@@ -132,6 +139,35 @@
       "match": "\\b0[xX]0*[1-9a-zA-Z][0-9a-zA-Z]*\\b",
       "patterns": []
     },
+    "string_placeholder": {
+      "patterns": [
+        {
+          "match": "%(\\[\\d+\\])?([\\+#\\-0\\x20]{,2}((\\d+|\\*)?(\\.?(\\d+|\\*|(\\[\\d+\\])\\*?)?(\\[\\d+\\])?)?))?[vT%tbcdoqxXUbeEfFgGspw]",
+          "name": "constant.other.placeholder.go"
+        }
+      ]
+    },
+    "raw_string_literals": {
+      "comment": "Raw string literals",
+      "begin": "`",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.go"
+        }
+      },
+      "end": "`",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.go"
+        }
+      },
+      "name": "string.quoted.raw.go",
+      "patterns": [
+        {
+          "include": "#string_placeholder"
+        }
+      ]
+    },
     "entity": {
       "patterns": [
         {
@@ -155,6 +191,10 @@
         {
           "name": "entity.name.namespace.plum",
           "match": "\\b([[:lower:]][[:word:]]*):"
+        },
+        {
+          "name": "entity.name.namespace.plum",
+          "match": "\\b(doc|check|expect|where)\\b"
         }
       ]
     },

~repos /plum

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

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