2021-07-02 00:54:04 +02:00
|
|
|
use crate::{Signature, Span};
|
2021-06-30 03:42:56 +02:00
|
|
|
use std::{collections::HashMap, sync::Arc};
|
|
|
|
|
|
|
|
pub struct ParserState {
|
2021-07-03 05:11:24 +02:00
|
|
|
files: Vec<(String, Vec<u8>)>,
|
2021-07-01 08:09:55 +02:00
|
|
|
vars: Vec<Type>,
|
|
|
|
decls: Vec<Signature>,
|
2021-06-30 03:42:56 +02:00
|
|
|
}
|
|
|
|
|
2021-07-01 02:01:04 +02:00
|
|
|
#[derive(Clone, Copy, Debug)]
|
|
|
|
pub enum Type {
|
|
|
|
Int,
|
|
|
|
Unknown,
|
|
|
|
}
|
|
|
|
|
|
|
|
pub type VarId = usize;
|
2021-07-01 08:09:55 +02:00
|
|
|
pub type DeclId = usize;
|
2021-06-30 03:42:56 +02:00
|
|
|
|
2021-07-02 00:40:08 +02:00
|
|
|
#[derive(Debug)]
|
2021-06-30 03:42:56 +02:00
|
|
|
struct ScopeFrame {
|
2021-07-01 02:01:04 +02:00
|
|
|
vars: HashMap<Vec<u8>, VarId>,
|
2021-07-01 08:09:55 +02:00
|
|
|
decls: HashMap<Vec<u8>, DeclId>,
|
2021-06-30 03:42:56 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
impl ScopeFrame {
|
|
|
|
pub fn new() -> Self {
|
|
|
|
Self {
|
|
|
|
vars: HashMap::new(),
|
2021-07-01 08:09:55 +02:00
|
|
|
decls: HashMap::new(),
|
2021-06-30 03:42:56 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Default for ParserState {
|
|
|
|
fn default() -> Self {
|
|
|
|
Self::new()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl ParserState {
|
|
|
|
pub fn new() -> Self {
|
2021-07-01 08:09:55 +02:00
|
|
|
Self {
|
|
|
|
files: vec![],
|
|
|
|
vars: vec![],
|
|
|
|
decls: vec![],
|
|
|
|
}
|
2021-06-30 03:42:56 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn merge_working_set(this: &mut Arc<ParserState>, mut working_set: ParserWorkingSet) {
|
|
|
|
// Remove the working set's reference to the permanent state so we can safely take a mutable reference
|
|
|
|
working_set.permanent_state = None;
|
|
|
|
|
|
|
|
// Take the mutable reference and extend the permanent state from the working set
|
|
|
|
if let Some(this) = std::sync::Arc::<ParserState>::get_mut(this) {
|
|
|
|
this.files.extend(working_set.files);
|
2021-07-02 03:42:25 +02:00
|
|
|
this.decls.extend(working_set.decls);
|
|
|
|
this.vars.extend(working_set.vars);
|
|
|
|
|
|
|
|
//FIXME: add scope frame merging
|
2021-06-30 03:42:56 +02:00
|
|
|
} else {
|
|
|
|
panic!("Internal error: merging working set should always succeed");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn num_files(&self) -> usize {
|
|
|
|
self.files.len()
|
|
|
|
}
|
|
|
|
|
2021-07-01 08:09:55 +02:00
|
|
|
pub fn num_vars(&self) -> usize {
|
|
|
|
self.vars.len()
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn num_decls(&self) -> usize {
|
|
|
|
self.decls.len()
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn get_var(&self, var_id: VarId) -> Option<&Type> {
|
|
|
|
self.vars.get(var_id)
|
|
|
|
}
|
|
|
|
|
2021-07-02 00:40:08 +02:00
|
|
|
pub fn get_decl(&self, decl_id: DeclId) -> Option<&Signature> {
|
2021-07-01 08:09:55 +02:00
|
|
|
self.decls.get(decl_id)
|
|
|
|
}
|
|
|
|
|
2021-07-02 00:54:04 +02:00
|
|
|
#[allow(unused)]
|
2021-06-30 03:42:56 +02:00
|
|
|
pub(crate) fn add_file(&mut self, filename: String, contents: Vec<u8>) -> usize {
|
2021-07-03 05:11:24 +02:00
|
|
|
self.files.push((filename, contents));
|
2021-06-30 03:42:56 +02:00
|
|
|
|
2021-07-03 03:29:56 +02:00
|
|
|
self.num_files() - 1
|
2021-06-30 03:42:56 +02:00
|
|
|
}
|
2021-07-03 05:11:24 +02:00
|
|
|
|
|
|
|
pub(crate) fn get_file_contents(&self, idx: usize) -> &[u8] {
|
|
|
|
&self.files[idx].1
|
|
|
|
}
|
2021-06-30 03:42:56 +02:00
|
|
|
}
|
|
|
|
|
2021-07-01 08:09:55 +02:00
|
|
|
pub struct ParserWorkingSet {
|
2021-07-03 05:11:24 +02:00
|
|
|
files: Vec<(String, Vec<u8>)>,
|
2021-07-01 08:09:55 +02:00
|
|
|
vars: Vec<Type>, // indexed by VarId
|
|
|
|
decls: Vec<Signature>, // indexed by DeclId
|
|
|
|
permanent_state: Option<Arc<ParserState>>,
|
|
|
|
scope: Vec<ScopeFrame>,
|
|
|
|
}
|
|
|
|
|
2021-06-30 03:42:56 +02:00
|
|
|
impl ParserWorkingSet {
|
|
|
|
pub fn new(permanent_state: Option<Arc<ParserState>>) -> Self {
|
|
|
|
Self {
|
|
|
|
files: vec![],
|
2021-07-01 08:09:55 +02:00
|
|
|
vars: vec![],
|
|
|
|
decls: vec![],
|
2021-06-30 03:42:56 +02:00
|
|
|
permanent_state,
|
2021-07-02 00:40:08 +02:00
|
|
|
scope: vec![ScopeFrame::new()],
|
2021-06-30 03:42:56 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn num_files(&self) -> usize {
|
|
|
|
let parent_len = if let Some(permanent_state) = &self.permanent_state {
|
|
|
|
permanent_state.num_files()
|
|
|
|
} else {
|
|
|
|
0
|
|
|
|
};
|
|
|
|
|
|
|
|
self.files.len() + parent_len
|
|
|
|
}
|
|
|
|
|
2021-07-02 00:40:08 +02:00
|
|
|
pub fn add_decl(&mut self, name: Vec<u8>, sig: Signature) -> DeclId {
|
|
|
|
let scope_frame = self
|
|
|
|
.scope
|
|
|
|
.last_mut()
|
|
|
|
.expect("internal error: missing required scope frame");
|
|
|
|
|
|
|
|
self.decls.push(sig);
|
|
|
|
let decl_id = self.decls.len() - 1;
|
|
|
|
|
|
|
|
scope_frame.decls.insert(name, decl_id);
|
|
|
|
|
|
|
|
decl_id
|
|
|
|
}
|
|
|
|
|
2021-06-30 03:42:56 +02:00
|
|
|
pub fn add_file(&mut self, filename: String, contents: Vec<u8>) -> usize {
|
2021-07-03 05:11:24 +02:00
|
|
|
self.files.push((filename, contents));
|
2021-06-30 03:42:56 +02:00
|
|
|
|
|
|
|
self.num_files() - 1
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn get_span_contents(&self, span: Span) -> &[u8] {
|
|
|
|
if let Some(permanent_state) = &self.permanent_state {
|
2021-07-03 05:11:24 +02:00
|
|
|
let num_permanent_files = permanent_state.num_files();
|
|
|
|
if span.file_id < num_permanent_files {
|
|
|
|
&permanent_state.get_file_contents(span.file_id)[span.start..span.end]
|
|
|
|
} else {
|
|
|
|
&self.files[span.file_id - num_permanent_files].1[span.start..span.end]
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
&self.files[span.file_id].1[span.start..span.end]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn get_file_contents(&self, file_id: usize) -> &[u8] {
|
|
|
|
if let Some(permanent_state) = &self.permanent_state {
|
|
|
|
let num_permanent_files = permanent_state.num_files();
|
|
|
|
if file_id < num_permanent_files {
|
|
|
|
&permanent_state.get_file_contents(file_id)
|
2021-07-02 09:15:30 +02:00
|
|
|
} else {
|
2021-07-03 05:11:24 +02:00
|
|
|
&self.files[file_id - num_permanent_files].1
|
2021-07-02 09:15:30 +02:00
|
|
|
}
|
|
|
|
} else {
|
2021-07-03 05:11:24 +02:00
|
|
|
&self.files[file_id].1
|
2021-07-02 09:15:30 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-30 03:42:56 +02:00
|
|
|
pub fn enter_scope(&mut self) {
|
|
|
|
self.scope.push(ScopeFrame::new());
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn exit_scope(&mut self) {
|
|
|
|
self.scope.push(ScopeFrame::new());
|
|
|
|
}
|
|
|
|
|
2021-07-01 08:09:55 +02:00
|
|
|
pub fn find_decl(&self, name: &[u8]) -> Option<DeclId> {
|
|
|
|
for scope in self.scope.iter().rev().enumerate() {
|
|
|
|
if let Some(decl_id) = scope.1.decls.get(name) {
|
|
|
|
return Some(*decl_id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
None
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn next_var_id(&self) -> VarId {
|
|
|
|
if let Some(permanent_state) = &self.permanent_state {
|
|
|
|
let num_permanent_vars = permanent_state.num_vars();
|
|
|
|
num_permanent_vars + self.vars.len()
|
|
|
|
} else {
|
|
|
|
self.vars.len()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn find_variable(&self, name: &[u8]) -> Option<VarId> {
|
2021-06-30 03:42:56 +02:00
|
|
|
for scope in self.scope.iter().rev().enumerate() {
|
2021-07-01 03:31:02 +02:00
|
|
|
if let Some(var_id) = scope.1.vars.get(name) {
|
2021-07-01 08:09:55 +02:00
|
|
|
return Some(*var_id);
|
2021-06-30 03:42:56 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
None
|
|
|
|
}
|
|
|
|
|
2021-07-01 02:01:04 +02:00
|
|
|
pub fn add_variable(&mut self, name: Vec<u8>, ty: Type) -> VarId {
|
2021-07-01 08:09:55 +02:00
|
|
|
let next_id = self.next_var_id();
|
|
|
|
|
2021-07-01 02:01:04 +02:00
|
|
|
let last = self
|
|
|
|
.scope
|
|
|
|
.last_mut()
|
|
|
|
.expect("internal error: missing stack frame");
|
|
|
|
|
|
|
|
last.vars.insert(name, next_id);
|
|
|
|
|
|
|
|
self.vars.insert(next_id, ty);
|
|
|
|
|
|
|
|
next_id
|
|
|
|
}
|
2021-07-01 08:09:55 +02:00
|
|
|
|
|
|
|
pub fn get_variable(&self, var_id: VarId) -> Option<&Type> {
|
|
|
|
if let Some(permanent_state) = &self.permanent_state {
|
|
|
|
let num_permanent_vars = permanent_state.num_vars();
|
|
|
|
if var_id < num_permanent_vars {
|
|
|
|
permanent_state.get_var(var_id)
|
|
|
|
} else {
|
|
|
|
self.vars.get(var_id - num_permanent_vars)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
self.vars.get(var_id)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn get_decl(&self, decl_id: DeclId) -> Option<&Signature> {
|
|
|
|
if let Some(permanent_state) = &self.permanent_state {
|
|
|
|
let num_permanent_decls = permanent_state.num_decls();
|
|
|
|
if decl_id < num_permanent_decls {
|
|
|
|
permanent_state.get_decl(decl_id)
|
|
|
|
} else {
|
|
|
|
self.decls.get(decl_id - num_permanent_decls)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
self.decls.get(decl_id)
|
|
|
|
}
|
|
|
|
}
|
2021-07-01 02:01:04 +02:00
|
|
|
}
|
2021-06-30 03:42:56 +02:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod parser_state_tests {
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn add_file_gives_id() {
|
|
|
|
let mut parser_state = ParserWorkingSet::new(Some(Arc::new(ParserState::new())));
|
|
|
|
let id = parser_state.add_file("test.nu".into(), vec![]);
|
|
|
|
|
|
|
|
assert_eq!(id, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn add_file_gives_id_including_parent() {
|
|
|
|
let mut parser_state = ParserState::new();
|
|
|
|
let parent_id = parser_state.add_file("test.nu".into(), vec![]);
|
|
|
|
|
|
|
|
let mut working_set = ParserWorkingSet::new(Some(Arc::new(parser_state)));
|
|
|
|
let working_set_id = working_set.add_file("child.nu".into(), vec![]);
|
|
|
|
|
|
|
|
assert_eq!(parent_id, 0);
|
|
|
|
assert_eq!(working_set_id, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn merge_states() {
|
|
|
|
let mut parser_state = ParserState::new();
|
2021-07-02 00:54:04 +02:00
|
|
|
parser_state.add_file("test.nu".into(), vec![]);
|
2021-06-30 03:42:56 +02:00
|
|
|
let mut parser_state = Arc::new(parser_state);
|
|
|
|
|
|
|
|
let mut working_set = ParserWorkingSet::new(Some(parser_state.clone()));
|
2021-07-02 00:54:04 +02:00
|
|
|
working_set.add_file("child.nu".into(), vec![]);
|
2021-06-30 03:42:56 +02:00
|
|
|
|
|
|
|
ParserState::merge_working_set(&mut parser_state, working_set);
|
|
|
|
|
|
|
|
assert_eq!(parser_state.num_files(), 2);
|
|
|
|
assert_eq!(&parser_state.files[0].0, "test.nu");
|
|
|
|
assert_eq!(&parser_state.files[1].0, "child.nu");
|
|
|
|
}
|
|
|
|
}
|