M-Labs/nac3
M-Labs
/
nac3
8
0
Fork 10
Code Issues 98 Pull Requests 18 Releases Wiki Activity

hm-inference #6

Merged
sb10q merged 136 commits from hm-inference into master 2021-08-19 11:46:50 +08:00
Conversation 1 Commits 136 Files Changed 29 +11 -4
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8452579c67 - Show all commits

1
Cargo.lock generated
View File

@ -467,6 +467,7 @@ dependencies = [
"itertools", "itertools",
"num-bigint 0.3.2", "num-bigint 0.3.2",
"num-traits", "num-traits",
"parking_lot",
"rustpython-parser", "rustpython-parser",
"test-case", "test-case",
] ]

1
nac3core/Cargo.toml
View File

@ -11,6 +11,7 @@ inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "master", feat
rustpython-parser = { git = "https://github.com/RustPython/RustPython", branch = "master" } rustpython-parser = { git = "https://github.com/RustPython/RustPython", branch = "master" }
itertools = "0.10.1" itertools = "0.10.1"
crossbeam = "0.8.1" crossbeam = "0.8.1"
parking_lot = "0.11.1"
[dev-dependencies] [dev-dependencies]
test-case = "1.2.0" test-case = "1.2.0"

13
nac3core/src/typecheck/top_level.rs
View File

@ -1,8 +1,8 @@
use std::collections::HashMap; use std::{collections::HashMap, sync::Arc};
use super::typedef::{SharedUnifier, Type}; use super::typedef::{SharedUnifier, Type, Unifier};
use crossbeam::queue::SegQueue; use crossbeam::queue::SegQueue;
use crossbeam::sync::ShardedLock; use parking_lot::RwLock;
use rustpython_parser::ast::Stmt; use rustpython_parser::ast::Stmt;
pub struct DefinitionId(usize); pub struct DefinitionId(usize);
@ -45,7 +45,12 @@ pub struct CodeGenTask {
} }
pub struct TopLevelContext { pub struct TopLevelContext {
pub definitions: Vec<ShardedLock<TopLevelDef>>, pub definitions: Vec<RwLock<TopLevelDef>>,
pub unifiers: Vec<SharedUnifier>, pub unifiers: Vec<SharedUnifier>,
pub codegen_queue: SegQueue<CodeGenTask>, pub codegen_queue: SegQueue<CodeGenTask>,
} }
pub struct WorkerContext {
pub unifier: Unifier,
pub top_level_ctx: Arc<RwLock<TopLevelContext>>,
}