Merge pull request #269 from koto-lang/derive-macros

Introduce macros for deriving KotoObject traits
koto-lang · Dec 24, 2023 · 1b6b925 · 1b6b925
2 parents da1aa8b + 4cfd2d9
commit 1b6b925
Show file tree

Hide file tree

Showing 121 changed files with 1,268 additions and 991 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,14 +6,19 @@ The format of this changelog is based on
 The Koto project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## [0.13.0] Unreleased
 
 ### Added
 
 #### Language
 
 - The `+` operator has been reintroduced for tuples, lists, and maps.
 
+#### API
+
+- The `koto_derive` crate has been introduced containing derive macros that make
+  it easier to implement `KotoObject`s.
+
 ### Changed
 
 #### Core Library
@@ -31,6 +36,12 @@ The Koto project adheres to
   - e.g. 
     `export { edit_mode: 'vi' }` is now `export { repl: { edit_mode: 'vi' }}`
 
+### Removed 
+
+#### API
+
+- `ObjectEntryBuilder` has been replaced with macros from `koto_derive`.
+
 
 ## [0.12.0] 2023.10.18
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["core/*", "examples/*", "libs/*"]
+members = ["crates/*", "examples/*", "libs/*"]
 resolver = "2"
 
 [workspace.dependencies]
@@ -37,8 +37,12 @@ nannou_core = "0.18.0"
 palette = "0.7.2"
 # An ultra simple CLI arguments parser.
 pico-args = { version = "0.3.4", default-features = false }
+# A substitute implementation of the compiler's `proc_macro` API
+proc-macro2 = "1.0.70"
 # A pull parser for CommonMark
 pulldown-cmark = { version = "0.9.1", default-features = false }
+# Quasi-quoting macro quote!(...)
+quote = "1.0.33"
 # Random number generators and other randomness functionality.
 rand = "0.8.5"
 # ChaCha random number generator
@@ -55,6 +59,8 @@ serde_json = { version = "1.0.0", features = ["preserve_order", "std"] }
 serde_yaml = "0.8.20"
 # 'Small vector' optimization: store up to a small number of items on the stack
 smallvec = { version = "1.11.1", features = ["const_generics", "union"] }
+# Parser for Rust source code
+syn = { version = "2.0.41", features = ["full"] }
 # A library for managing temporary files and directories.
 tempfile = "3.1"
 # A crate for getting the crate binary in an integration test.

diff --git a/core/runtime/src/core_lib/os.rs b/core/runtime/src/core_lib/os.rs
diff --git a/core/bytecode/Cargo.toml → crates/bytecode/Cargo.toml b/core/bytecode/Cargo.toml → crates/bytecode/Cargo.toml
diff --git a/core/bytecode/src/chunk.rs → crates/bytecode/src/chunk.rs b/core/bytecode/src/chunk.rs → crates/bytecode/src/chunk.rs
diff --git a/core/bytecode/src/compiler.rs → crates/bytecode/src/compiler.rs b/core/bytecode/src/compiler.rs → crates/bytecode/src/compiler.rs
diff --git a/core/bytecode/src/instruction.rs → crates/bytecode/src/instruction.rs b/core/bytecode/src/instruction.rs → crates/bytecode/src/instruction.rs
diff --git a/core/bytecode/src/instruction_reader.rs → crates/bytecode/src/instruction_reader.rs b/core/bytecode/src/instruction_reader.rs → crates/bytecode/src/instruction_reader.rs
diff --git a/core/bytecode/src/lib.rs → crates/bytecode/src/lib.rs b/core/bytecode/src/lib.rs → crates/bytecode/src/lib.rs
@@ -1,4 +1,3 @@
-//!
 //! Contains Koto's compiler and its bytecode operations
 
 #![warn(missing_docs)]

diff --git a/core/bytecode/src/loader.rs → crates/bytecode/src/loader.rs b/core/bytecode/src/loader.rs → crates/bytecode/src/loader.rs
diff --git a/core/bytecode/src/op.rs → crates/bytecode/src/op.rs b/core/bytecode/src/op.rs → crates/bytecode/src/op.rs
diff --git a/core/bytecode/tests/compile_failures.rs → crates/bytecode/tests/compile_failures.rs b/core/bytecode/tests/compile_failures.rs → crates/bytecode/tests/compile_failures.rs
diff --git a/core/cli/Cargo.toml → crates/cli/Cargo.toml b/core/cli/Cargo.toml → crates/cli/Cargo.toml
diff --git a/core/cli/src/help.rs → crates/cli/src/help.rs b/core/cli/src/help.rs → crates/cli/src/help.rs
diff --git a/core/cli/src/main.rs → crates/cli/src/main.rs b/core/cli/src/main.rs → crates/cli/src/main.rs
diff --git a/core/cli/src/repl.rs → crates/cli/src/repl.rs b/core/cli/src/repl.rs → crates/cli/src/repl.rs
diff --git a/core/cli/tests/eval_tests.rs → crates/cli/tests/eval_tests.rs b/core/cli/tests/eval_tests.rs → crates/cli/tests/eval_tests.rs
diff --git a/core/cli/tests/stdin_tests.rs → crates/cli/tests/stdin_tests.rs b/core/cli/tests/stdin_tests.rs → crates/cli/tests/stdin_tests.rs
diff --git a/crates/derive/Cargo.toml b/crates/derive/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "koto_derive"
+version = "0.13.0"
+authors = ["irh <ian.r.hobson@gmail.com>"]
+edition = "2021"
+license = "MIT"
+description = "Macros for working with the Koto programming language"
+homepage = "https://koto.dev"
+repository = "https://github.com/koto-lang/koto"
+keywords = ["scripting", "language", "koto"]
+
+[lib]
+proc-macro = true
+
+[dependencies]
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+syn = { workspace = true }