@@ -126,7 +126,7 @@ task :install do #!/bin/sh PROGRAM=$1 shift -erl -noshell +K true -s Loader start $PROGRAM -s init stop -extra $*" +erl -noshell +K true -s reia erl_load $PROGRAM -s init stop -extra $*" end File.open(PREFIX + "/bin/ire", "w", 0755) do |f| f << "#!/bin/sh Rakefile @@ -3,4 +3,4 @@ PROGRAM=$1 shift -erl -pa ebin -pa ../ebin -noshell +K true -s Loader start $PROGRAM -s init stop -extra $* \ No newline at end of file +erl -pa ebin -pa ../ebin -noshell +K true -s reia erl_load $PROGRAM -s init stop -extra $* \ No newline at end of file bin/reia @@ -10,8 +10,8 @@ module Loader read_input([]) end - def start(args) - (:ok, input) = file::read_file(args[0]) + def start(file) + (:ok, input) = file::read_file(file) eval_input(input.to_string()) end src/core/Loader.re @@ -11,7 +11,8 @@ invoke/3, invoke/4, parse/1, spawn/2, spawn/3, - spawn_link/2, spawn_link/3 + spawn_link/2, spawn_link/3, + load_file/1, erl_load/1 ]). % Call the given Reia function from the Erlang environment, automatically @@ -49,4 +50,13 @@ spawn(Class, Arguments, Block) -> % its process to this one spawn_link(Class, Arguments) -> reia:spawn(Class, Arguments, nil). spawn_link(Class, Arguments, Block) -> - reia_class:inst(Class, Arguments, Block). \ No newline at end of file + reia_class:inst(Class, Arguments, Block). + +% Load the given file through the Reia loader +load_file(File) -> + reia:apply('Loader', 'start', [File]). + +% Load a file when invoked from the Erlang command line +% Handles funky argument thunking coming off the shell +erl_load([File]) -> + load_file(File). \ No newline at end of file src/core/reia.erl 52f073d7b647c3455cd391bd652ae0e11c465e35 Tony Arcieri tony@medioh.com http://github.com/tarcieri/reia/commit/178deaa0997d608b09a886e9bbd537ab094cf5e6 178deaa0997d608b09a886e9bbd537ab094cf5e6 2009-03-25T23:14:09-07:00 2009-03-25T23:14:09-07:00 Have the 'reia' script thunk through the reia module, rather than calling loader directly b8f2f671f3287671b93ae8ab78f0118d2a79c909 Tony Arcieri tony@medioh.com