Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

resolver = "2"

members = ["crates/plotnik-cli", "crates/plotnik-lib", "crates/plotnik-langs", "crates/plotnik-macros"]
members = ["crates/plotnik-cli", "crates/plotnik-lib", "crates/plotnik-langs", "crates/plotnik-macros", "crates/plotnik-core"]
10 changes: 3 additions & 7 deletions crates/plotnik-cli/src/commands/debug/source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub fn resolve_lang(
lang: &Option<String>,
_source_text: &Option<String>,
source_file: &Option<PathBuf>,
) -> &'static Lang {
) -> Lang {
if let Some(name) = lang {
return plotnik_langs::from_name(name).unwrap_or_else(|| {
eprintln!("error: unknown language: {}", name);
Expand All @@ -50,12 +50,8 @@ pub fn resolve_lang(
std::process::exit(1);
}

pub fn parse_tree(source: &str, lang: &Lang) -> tree_sitter::Tree {
let mut parser = tree_sitter::Parser::new();
parser
.set_language(&lang.ts_lang)
.expect("failed to set language");
parser.parse(source, None).expect("failed to parse source")
pub fn parse_tree(source: &str, lang: Lang) -> tree_sitter::Tree {
lang.parse(source)
}

pub fn dump_source(tree: &tree_sitter::Tree, source: &str, include_anonymous: bool) -> String {
Expand Down
18 changes: 9 additions & 9 deletions crates/plotnik-cli/src/commands/langs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ pub fn run() {
let langs = plotnik_langs::all();
println!("Supported languages ({}):", langs.len());
for lang in langs {
println!(" {}", lang.name);
println!(" {}", lang.name());
}
}

#[cfg(test)]
mod tests {
fn smoke_test(lang: &plotnik_langs::Lang, source: &str, expected_root: &str) {
let mut parser = tree_sitter::Parser::new();
parser.set_language(&lang.ts_lang).unwrap();
let tree = parser.parse(source, None).unwrap();
use plotnik_langs::Lang;

fn smoke_test(lang: Lang, source: &str, expected_root: &str) {
let tree = lang.parse(source);
let root = tree.root_node();
assert_eq!(root.kind(), expected_root);
assert!(!root.has_error());
Expand Down Expand Up @@ -204,9 +204,9 @@ mod tests {
#[test]
#[cfg(feature = "javascript")]
fn lang_from_name() {
assert_eq!(plotnik_langs::from_name("js").unwrap().name, "javascript");
assert_eq!(plotnik_langs::from_name("js").unwrap().name(), "javascript");
assert_eq!(
plotnik_langs::from_name("JavaScript").unwrap().name,
plotnik_langs::from_name("JavaScript").unwrap().name(),
"javascript"
);
assert!(plotnik_langs::from_name("unknown").is_none());
Expand All @@ -215,7 +215,7 @@ mod tests {
#[test]
#[cfg(feature = "javascript")]
fn lang_from_extension() {
assert_eq!(plotnik_langs::from_ext("js").unwrap().name, "javascript");
assert_eq!(plotnik_langs::from_ext("mjs").unwrap().name, "javascript");
assert_eq!(plotnik_langs::from_ext("js").unwrap().name(), "javascript");
assert_eq!(plotnik_langs::from_ext("mjs").unwrap().name(), "javascript");
}
}
14 changes: 14 additions & 0 deletions crates/plotnik-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[package]
name = "plotnik-core"
version = "0.1.0"
edition = "2024"
license = "MIT"
description = "Core data structures for Plotnik"
repository = "https://github.com/plotnik-lang/plotnik"

[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] }

[dependencies]
serde = { version = "1", features = ["derive"] }
serde_json = "1"
27 changes: 27 additions & 0 deletions crates/plotnik-core/src/invariants.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//! Invariant checks excluded from coverage reports.

#![cfg_attr(coverage_nightly, coverage(off))]

use crate::{DynamicNodeTypes, NodeTypeId, NodeTypeInfo, StaticNodeTypeInfo, StaticNodeTypes};

impl StaticNodeTypes {
pub(crate) fn ensure_node(&self, node_type_id: NodeTypeId) -> &'static StaticNodeTypeInfo {
self.get(node_type_id).unwrap_or_else(|| {
panic!(
"NodeTypes: node_type_id {node_type_id} not found \
(Lang must verify Language ↔ NodeTypes correspondence)"
)
})
}
}

impl DynamicNodeTypes {
pub(crate) fn ensure_node(&self, node_type_id: NodeTypeId) -> &NodeTypeInfo {
self.get(node_type_id).unwrap_or_else(|| {
panic!(
"NodeTypes: node_type_id {node_type_id} not found \
(Lang must verify Language ↔ NodeTypes correspondence)"
)
})
}
}
Loading