plum

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

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

e9b4405d — pyrossh

more stuff

Files changed (13) hide show

.gitignore +5 -1
Cargo.lock +115 -0
Cargo.toml +9 -0
libs/std/bool.plum +28 -31
src/compiler.rs +0 -0
src/main.rs +58 -0
test/sample.plum +16 -1
tooling/tree-sitter-plum/grammar.js +4 -4
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 +2 -2
tooling/tree-sitter-plum/test/corpus/type.txt +3 -0

.gitignore CHANGED Viewed

@@ -10,4 +10,8 @@ static/monaco-editor-workers/
 static/worker/
 node_modules
 *.vsix
-codegen
+codegen
+# Added by cargo
+/target

Cargo.lock ADDED Viewed

@@ -0,0 +1,115 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+[[package]]
+name = "baz-tree-sitter-traversal"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ae77a4ce9f364f49c87fdaf55d1ed79fb301003788acd26b64a46bda8f2a62"
+dependencies = [
+ "tree-sitter",
+]
+[[package]]
+name = "cc"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e"
+dependencies = [
+ "shlex",
+]
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+[[package]]
+name = "plum"
+version = "0.1.0"
+dependencies = [
+ "baz-tree-sitter-traversal",
+ "tree-sitter",
+ "tree-sitter-plum",
+]
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+[[package]]
+name = "streaming-iterator"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"
+[[package]]
+name = "tree-sitter"
+version = "0.24.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ac95b18f0f727aaaa012bd5179a1916706ee3ed071920fdbda738750b0c0bf5"
+dependencies = [
+ "cc",
+ "regex",
+ "regex-syntax",
+ "streaming-iterator",
+ "tree-sitter-language",
+]
+[[package]]
+name = "tree-sitter-language"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c199356c799a8945965bb5f2c55b2ad9d9aa7c4b4f6e587fe9dea0bc715e5f9c"
+[[package]]
+name = "tree-sitter-plum"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09aba615e0c63f018b1e09436d442ddbad3d69417fbeb1e369108445e6456682"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]

Cargo.toml ADDED Viewed

@@ -0,0 +1,9 @@
+[package]
+name = "plum"
+version = "0.1.0"
+edition = "2021"
+[dependencies]
+baz-tree-sitter-traversal = "0.1.4"
+tree-sitter = "0.24.5"
+tree-sitter-plum = "0.1.0"

libs/std/bool.plum CHANGED Viewed

@@ -2,39 +2,36 @@ module std
 type Int
-add<Int>(b: Int) -> Int =
+add<Int>(b: Int) -> Int = this + b
-  return this + b
-sub<Int>(b: Int) -> Int =
+sub<Int>(b: Int) -> Int = this - b
-  return this - b
 enum Bool =
   | True
   | False
-  fromStr(s: Str) -> Result[Bool, Err] =>
+parseBool<Str>() -> Result(Bool, Err) =
-    if s == "true"
+  if s == "true"
-      True
+    True
-    else if s == "false"
+  else if s == "false"
-      False
+    False
-    else
+  else
-      Err("could not parse bool from '{s}'")
+    Err("could not parse bool from '{s}'")
-  and(self, o: Bool) -> Bool =>
+and<Bool>(o: Bool) -> Bool =
-    match this, o
+  match this, o
-      True, True => True
+    True, True => True
-      True, False => False
+    True, False => False
-      False, True => False
+    False, True => False
-      False, False => False
+    False, False => False
-  or(self, o: Bool) -> Bool =>
+or<Bool>(o: Bool) -> Bool =
-    match this, o
+  match this, o
-      True, True => True
+    True, True => True
-      True, False => True
+    True, False => True
-      False, True => True
+    False, True => True
-      False, False => False
+    False, False => False
-  toStr(self) -> Str =>
+toStr<Bool>() -> Str =
-    match this
+  match this
-      True => "True"
+    True => "True"
-      False => "False"
+    False => "False"

src/compiler.rs DELETED Viewed

File without changes

src/main.rs ADDED Viewed

@@ -0,0 +1,58 @@
+use tree_sitter;
+use tree_sitter_plum;
+fn main() {
+    let code = r#"
+module std
+import std/int
+import std/str
+PI = 3.14
+MSG = "Hello World"
+SUM = 1 + {{2 * 3} / 4}
+ENABLED = !False
+# Animal is a set of behavior of every animal species
+trait Animal =
+  speak() -> Str
+# Cat is an animal that meows always
+type Cat(Animal, IToStr) =
+  name: Str
+  age: Int
+withName<Cat>(name: Str) -> Cat =
+  Cat(name: name, age: self.age)
+withAge<Cat>(age: Int) -> Cat =
+  Cat(name: self.name, age: age)
+speak<Cat>() -> Str =
+  "meow"
+toStr<Cat>() -> Str =
+  for i in 0..10
+    printLn("delta")
+  if dog > 1
+    printLn("Hellow")
+  else
+    printLn("New")
+  "Cat({self.name}, {self.age})"
+main() =
+  printLn("Hello world")
+"#;
+    let mut parser = tree_sitter::Parser::new();
+    let language = tree_sitter_plum::LANGUAGE;
+    parser
+        .set_language(&language.into())
+        .expect("Error loading plum parser");
+    let tree = parser.parse(code, None).unwrap();
+    assert!(!tree.root_node().has_error());
+    let mut cursor = tree.root_node().walk();
+    for item in tree.root_node().children(&mut cursor) {
+        println!("kind:{} {}", item.kind(), item.to_sexp());
+    }
+}

test/sample.plum CHANGED Viewed

@@ -256,4 +256,19 @@ main() =
   names.append("Jess")
   names
     .filter({ it == "Sam" })
-    .map({ it * 2 })
+    .map({ it * 2 })
+main() =
+  sum = 1 + {{2 * 3} / 4}
+  enabled = !False
+  open = {count > 10} && {enabled == True} || {debug == False}
+  countries_list = listOf("US", "INDIA", "CANADA")
+  list_ints = listOf(1, 2, 3)
+  nested_list_ints = listOf(listOf(1), listOf(2), listOf(3))
+  country_codes = mapOf(
+    "in" => "INDIA",
+    "us" => "United States",
+    "ca" => "Canada"
+  )
+  map_ints = mapOf("a" => 1, "b" => 2)
+  nested_map_ints = mapOf("a" => 1, "b" => mapOf("c" => 3, "d" => 4))

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

@@ -170,16 +170,16 @@ module.exports = grammar({
     const: ($) =>
       seq(
-        field("left", commaSep1($.const_identifier)),
+        $.const_identifier,
         "=",
-        field("right", commaSep1($.expression)),
+        $.expression,
       ),
     assign: ($) =>
       seq(
-        field("left", commaSep1($.var_identifier)),
+        commaSep1($.var_identifier),
         "=",
-        field("right", commaSep1($.expression)),
+        commaSep1($.expression),
       ),
     try: ($) => prec.right(seq("try", optional($.fn_call))),
     assert: ($) => seq("assert", $.expression),

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

@@ -9,11 +9,11 @@ SUM = 1 + {{2 * 3} / 4}
 ENABLED = !False
 # Animal is a set of behavior of every animal species
-trait Animal =
+trait IAnimal =
   speak() -> Str
 # Cat is an animal that meows always
-type Cat(Animal, ToStr) =
+type Cat(IAnimal, IToStr) =
   name: Str
   age: Int

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

@@ -10,6 +10,9 @@ type Cat(Stringable) =
   name: Str
   age: Int
+init<Cat>(name: Str) -> Cat =
+  Cat(name: name, age: 0)
 withName<Cat>(name: Str) -> Cat =
   Cat(name: name, age: 0)

~repos /plum

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

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