Merge pull request #2 from nextjournal/dev

Prefix module names to avoid name conflicts

Author: joergen7

src/effi.app.src

@@ -3,7 +3,7 @@
   {description, "Erlang Foreign Function Interface"},
   {vsn, "0.1.1-snapshot"},
   {modules, [
-             effi, effi_interact, effi_script, bash, python, r
+             effi, effi_interact, effi_script, effi_bash, effi_python, effi_r, effi_perl, lib_refactor
             ]},
   {registered, []},
   {applications, [

src/effi.erl

@@ -235,7 +235,7 @@ runscript( Dir, Refactor, [RequestFile, SumFile] ) ->
   {Lam, Fa, R, LibMap} = case erl_parse:parse_term( Tokens ) of
     {error, Reason} -> error( Reason );
     {ok, Y}         -> Y
-  end, 
+  end,
 
   % run script
   Summary = case check_run( Lam, Fa, R, Dir, LibMap ) of
@@ -403,35 +403,36 @@ when is_tuple( Lam ),
   {lam, _Line, _LamName, Sign, Body} = Lam,
   {forbody, Lang, Script} = Body,
   {sign, Lo, Li} = Sign,
+  Mod = list_to_existing_atom("effi_" ++ atom_to_list(Lang)),
 
   % get Foreign Function Interface type
-  FfiType = apply( Lang, ffi_type, [] ),
+  FfiType = apply( Mod, ffi_type, [] ),
 
   % include lib paths
-  LibPath = [[apply( Lang, libpath, [P] ), $\n] || P <- maps:get( Lang, LibMap, [] )],
+  LibPath = [[apply( Mod, libpath, [P] ), $\n] || P <- maps:get( Lang, LibMap, [] )],
 
   % collect assignments
   Assign = lists:map(
              fun( {param, {name, N, _Pf}, Pl} ) ->
                X = maps:get( N, Fa ),
                X1 = [S ||{str, S} <- X],
-               [apply( Lang, assignment, [N, Pl, X1] ), $\n]
+               [apply( Mod, assignment, [N, Pl, X1] ), $\n]
              end,
              Li ),
 
   % collect dismissals
   Suffix = lists:map(
              fun( {param, {name, N, _Pf}, Pl} ) ->
-               [apply( Lang, dismissal, [N, Pl] ), $\n]
+               [apply( Mod, dismissal, [N, Pl] ), $\n]
              end,
              Lo ),
 
-  Script1 = apply( Lang, preprocess, [Script] ),
+  Script1 = apply( Mod, preprocess, [Script] ),
 
   Script2 = io_lib:format( "~s~n~s~n~s~n~s~n", [LibPath, Assign, Script1, Suffix] ),
 
   % run script
-  {_Port, _ActScript} = apply( FfiType, create_port, [Lang, Script2, Dir] ).
+  {_Port, _ActScript} = apply( FfiType, create_port, [Mod, Script2, Dir] ).
 
 
 

src/bash.erl src/effi_bash.erlsrc/bash.erl renamed to src/effi_bash.erl

@@ -19,7 +19,7 @@
 %% @author Jörgen Brandt <brandjoe@hu-berlin.de>
 
 
--module( bash ).
+-module( effi_bash ).
 -author( "Jorgen Brandt <brandjoe@hu-berlin.de>" ).
 -vsn( "0.1.1-snapshot" ).
 

src/effi_interact.erl

@@ -58,20 +58,20 @@
 
 %% create_port/3
 %
-create_port( Lang, Script, Dir )
+create_port( Mod, Script, Dir )
 
-when is_atom( Lang ),
+when is_atom( Mod ),
      is_list( Script ),
      is_list( Dir ) ->
 
   % get interpreter
-  Interpreter = apply( Lang, interpreter, [] ),
+  Interpreter = apply( Mod, interpreter, [] ),
 
   % get prefix
-  Prefix = apply( Lang, prefix, [] ),
+  Prefix = apply( Mod, prefix, [] ),
 
   % get suffix
-  Suffix = apply( Lang, suffix, [] ),
+  Suffix = apply( Mod, suffix, [] ),
 
   % complement script
   ActScript = string:join( [Prefix, Script, Suffix, ""], "\n" ),

src/perl.erl src/effi_perl.erlsrc/perl.erl renamed to src/effi_perl.erl

@@ -19,7 +19,7 @@
 %% @author Jörgen Brandt <brandjoe@hu-berlin.de>
 
 
--module( perl ).
+-module( effi_perl ).
 -author( "Jorgen Brandt <brandjoe@hu-berlin.de>" ).
 -vsn( "0.1.1-snapshot" ).
 

src/python.erl src/effi_python.erlsrc/python.erl renamed to src/effi_python.erl

@@ -19,7 +19,7 @@
 %% @author Jörgen Brandt <brandjoe@hu-berlin.de>
 
 
--module( python ).
+-module( effi_python ).
 -author( "Jorgen Brandt <brandjoe@hu-berlin.de>" ).
 -vsn( "0.1.1-snapshot" ).
 

src/r.erl src/effi_r.erlsrc/r.erl renamed to src/effi_r.erl

@@ -19,7 +19,7 @@
 %% @author Jörgen Brandt <brandjoe@hu-berlin.de>
 
 
--module( r ).
+-module( effi_r ).
 -author( "Jorgen Brandt <brandjoe@hu-berlin.de>" ).
 -vsn( "0.1.1-snapshot" ).