ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-12-26 19:51:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #896 from AleoHQ/feature-relative-imports

Browse Source 
[CLI] Makes import path relative to program directory
This commit is contained in:
Collin Chin 2021-04-26 13:37:19 -07:00 committed by GitHub
commit b6f6f051f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/src/compiler.rs
View File

@ -229,7 +229,11 @@ impl<'a, F: PrimeField, G: GroupType<F>> Compiler<'a, F, G> {
tracing::debug!("Program parsing complete\n{:#?}", self.program); tracing::debug!("Program parsing complete\n{:#?}", self.program);
// Create a new symbol table from the program, imported_programs, and program_input. // Create a new symbol table from the program, imported_programs, and program_input.
let asg = Asg::new(self.context, &self.program, &mut leo_imports::ImportParser::default())?; let asg = Asg::new(
self.context,
&self.program,
&mut leo_imports::ImportParser::new(self.main_file_path.clone()),
)?;
tracing::debug!("ASG generation complete"); tracing::debug!("ASG generation complete");

17
imports/src/parser/import_parser.rs
View File

@ -18,7 +18,7 @@ use crate::errors::ImportParserError;
use leo_asg::{AsgContext, AsgConvertError, ImportResolver, Program, Span}; use leo_asg::{AsgContext, AsgConvertError, ImportResolver, Program, Span};
use indexmap::{IndexMap, IndexSet}; use indexmap::{IndexMap, IndexSet};
use std::env::current_dir; use std::path::PathBuf;
/// Stores imported packages. /// Stores imported packages.
/// ///
@ -26,11 +26,21 @@ use std::env::current_dir;
/// directory, foreign in the imports directory, or part of the core package list. /// directory, foreign in the imports directory, or part of the core package list.
#[derive(Clone, Default)] #[derive(Clone, Default)]
pub struct ImportParser<'a> { pub struct ImportParser<'a> {
program_path: PathBuf,
partial_imports: IndexSet<String>, partial_imports: IndexSet<String>,
imports: IndexMap<String, Program<'a>>, imports: IndexMap<String, Program<'a>>,
} }
//todo: handle relative imports relative to file... impl<'a> ImportParser<'a> {
pub fn new(program_path: PathBuf) -> Self {
ImportParser {
program_path,
partial_imports: Default::default(),
imports: Default::default(),
}
}
}
impl<'a> ImportResolver<'a> for ImportParser<'a> { impl<'a> ImportResolver<'a> for ImportParser<'a> {
fn resolve_package( fn resolve_package(
&mut self, &mut self,
@ -46,8 +56,7 @@ impl<'a> ImportResolver<'a> for ImportParser<'a> {
return Ok(Some(program.clone())); return Ok(Some(program.clone()));
} }
let mut imports = Self::default(); let mut imports = Self::default();
let path = let path = self.program_path.clone();
current_dir().map_err(|x| -> AsgConvertError { ImportParserError::current_directory_error(x).into() })?;
self.partial_imports.insert(full_path.clone()); self.partial_imports.insert(full_path.clone());
let program = imports let program = imports

5
leo/main.rs
View File

@ -361,13 +361,12 @@ mod cli_tests {
} }
#[test] #[test]
#[ignore] // ignore until imports path is fixed #875
fn test_sudoku() { fn test_sudoku() {
let path = &Some(PathBuf::from("examples/silly-sudoku")); let path = &Some(PathBuf::from("examples/silly-sudoku"));
assert!(run_cmd("leo build", path).is_ok()); assert!(run_cmd("leo build", path).is_ok());
assert!(run_cmd("leo test", path).is_ok()); assert!(run_cmd("leo test", path).is_ok());
assert!(run_cmd("leo test -f src/lib.leo", path).is_ok()); assert!(run_cmd("leo test -f examples/silly-sudoku/src/lib.leo", path).is_ok());
assert!(run_cmd("leo test -f src/main.leo", path).is_ok()); assert!(run_cmd("leo test -f examples/silly-sudoku/src/main.leo", path).is_ok());
} }
} }