sms/ssc
1
0
Fork 0
Code Issues Pull requests Releases 2 Activity

Fixed: default import resolver on main script file.

Browse source
This commit is contained in:
arookas 2015-12-09 23:14:10 -05:00
parent 545f6575db
commit 1648e27988
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
import resolver.cs
View file

@ -19,11 +19,12 @@ namespace arookas
{
List<sunScriptFile> imports = new List<sunScriptFile>(10);
Stack<sunScriptFile> current = new Stack<sunScriptFile>(5);
string rootDirectory;
string rootDirectory, currentDirectory;
public sunDefaultImportResolver()
{
rootDirectory = AppDomain.CurrentDomain.BaseDirectory;
currentDirectory = Directory.GetCurrentDirectory();
}
public override void EnterFile(sunScriptFile file) { current.Push(file); }
@ -43,12 +44,24 @@ namespace arookas
}
else
{
// check if the file exists relative to the current one;
// if it's not there, check the root directory
fullPath = Path.Combine(Path.GetDirectoryName(current.Peek().Name), name);
if (!File.Exists(fullPath))
if (current.Count > 0)
{
fullPath = Path.Combine(rootDirectory, name);
// check if the file exists relative to the current one;
// if it's not there, check the root directory
fullPath = Path.Combine(Path.GetDirectoryName(current.Peek().Name), name);
if (!File.Exists(fullPath))
{
fullPath = Path.Combine(rootDirectory, name);
if (!File.Exists(fullPath))
{
return sunImportResult.Missing;
}
}
}
else
{
// if this is the main script file (i.e. current stack is empty), just use the current directory
fullPath = Path.Combine(currentDirectory, name);
if (!File.Exists(fullPath))
{
return sunImportResult.Missing;