zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-22 18:19:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: OS portable import and include paths.

Browse Source 
Adds #38
This commit is contained in:
Jeremy Wall 2019-03-20 20:08:43 -05:00
parent f86d9b8ec6
commit b6a7f9778c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/build/mod.rs
View File

@ -430,8 +430,10 @@ impl<'a> FileBuilder<'a> {
.to_boxed()); .to_boxed());
} }
} }
let sep = format!("{}", std::path::MAIN_SEPARATOR);
let raw_path = def.path.fragment.replace("/", &sep);
// Try a relative path first. // Try a relative path first.
let normalized = match self.find_file(&def.path.fragment, true) { let normalized = match self.find_file(&raw_path, true) {
Ok(p) => p, Ok(p) => p,
Err(e) => { Err(e) => {
return Err(error::BuildError::with_pos( return Err(error::BuildError::with_pos(
@ -1722,7 +1724,9 @@ impl<'a> FileBuilder<'a> {
} }
fn get_file_as_string(&self, pos: &Position, path: &str) -> Result<String, Box<dyn Error>> { fn get_file_as_string(&self, pos: &Position, path: &str) -> Result<String, Box<dyn Error>> {
let normalized = match self.find_file(path, false) { let sep = format!("{}", std::path::MAIN_SEPARATOR);
let raw_path = path.replace("/", &sep);
let normalized = match self.find_file(raw_path, false) {
Ok(p) => p, Ok(p) => p,
Err(e) => { Err(e) => {
return Err(error::BuildError::with_pos( return Err(error::BuildError::with_pos(