Skip to content

Allow IPlugins to be passed directly to the compiler #964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mavnn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow IPlugins to be passed directly to the compiler #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions compiler/Compiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class Options
{
public string sourceFilename;
public List<string> pluginDirectories;
public List<IPlugin> plugins;
public bool countAllVisits;
public Ink.ErrorHandler errorHandler;
public Ink.IFileHandler fileHandler;
Expand All @@ -25,8 +26,11 @@ public Compiler (string inkSource, Options options = null)
{
_inputString = inkSource;
_options = options ?? new Options();
if( _options.pluginDirectories != null )
_pluginManager = new PluginManager (_options.pluginDirectories);
if( _options.pluginDirectories != null || _options.plugins != null)
{
var directories = _options.pluginDirectories != null ? _options.pluginDirectories : new List<string>();
_pluginManager = new PluginManager(directories, _options.plugins);
}
}

public Parsed.Story Parse()
Expand Down
6 changes: 3 additions & 3 deletions compiler/Plugins/PluginManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ namespace Ink
{
public class PluginManager
{
public PluginManager (List<string> pluginDirectories)
public PluginManager (List<string> pluginDirectories, List<IPlugin> plugins = null)
{
_plugins = new List<IPlugin> ();
_plugins = plugins != null ? plugins : new List<IPlugin>();

foreach (string pluginName in pluginDirectories)
foreach (string pluginName in pluginDirectories)
{
foreach (string file in Directory.GetFiles(pluginName, "*.dll"))
{
Expand Down