@@ -1,7 +1,7 @@ %% @author Yariv Sadan <yarivsblog@gmail.com> [http://yarivsblog.com] %% @copyright Yariv Sadan 2006-2007 %% @doc ErlyDB: The Erlang Twist on Database Abstraction. -%% +%% %% == Contents == %% %% {@section Introduction}<br/> @@ -95,7 +95,8 @@ start/2, code_gen/2, code_gen/3, - code_gen/4]). + code_gen/4, + code_gen/5]). -import(erlyweb_util, [log/5]). -define(Debug(Msg, Params), log(?MODULE, ?LINE, debug, Msg, Params)). @@ -149,6 +150,10 @@ code_gen(Modules, Drivers) -> code_gen(Modules, Drivers, Options) -> code_gen(Modules, Drivers, Options, []). +%% @equiv code_gen(Modules, Drivers, Options, IncludePaths, []) +code_gen(Modules, Drivers, Options, IncludePaths) -> + code_gen(Modules, Drivers, Options, IncludePaths, []). + %% @doc Generate code for the list of modules using the provided drivers. %% %% If you're using ErlyWeb, you shouldn't need to call this function directly. @@ -214,6 +219,11 @@ code_gen(Modules, Drivers, Options) -> %% Additional include paths that will be used to search for header files %% when compiling the modules. %% +%% ==== Macros ==== +%% +%% Macro definitions that will be used for conditional compilation. These are +%% represented in the same way as 'PredefMacros' in epp:parse_file/2. +%% %% === Examples === %% %% Generate code for "musician.erl" using the MySQL driver. Only the default @@ -276,17 +286,17 @@ code_gen(Modules, Drivers, Options) -> %% a 'driver' option or only a 'pool_id' option. %% %% @spec code_gen([Module::atom() | string()], [driver()] | driver(), -%% Options::[term()], [IncludePath::string()]) -> +%% Options::[term()], [IncludePath::string()], [Macro::{atom(), term()}]) -> %% ok | {error, Err} %% @type driver() = Driver::atom() | %% {Driver::atom(), DriverOptions::proplist()} | %% {Driver::atom(), DriverOptions::proplist(), [pool()]} %% @type pool() = PoolId::atom() | {default, PoolId::atom()} -code_gen(_Modules, [], _Options, _IncludePaths) -> +code_gen(_Modules, [], _Options, _IncludePaths, _Macros) -> exit(no_drivers_specified); -code_gen(Modules, Driver, Options, IncludePaths) when not is_list(Driver) -> - code_gen(Modules, [Driver], Options, IncludePaths); -code_gen(Modules, Drivers, Options, IncludePaths) -> +code_gen(Modules, Driver, Options, IncludePaths, Macros) when not is_list(Driver) -> + code_gen(Modules, [Driver], Options, IncludePaths, Macros); +code_gen(Modules, Drivers, Options, IncludePaths, Macros) -> %% Normalize the driver tuples. DriverTuples = @@ -360,12 +370,12 @@ code_gen(Modules, Drivers, Options, IncludePaths) -> fun(Module) -> DefaultDriverMod = element(1, hd(DriverTuples)), gen_module_code(Module, DefaultDriverMod, DriversData, - Options, IncludePaths) + Options, IncludePaths, Macros) end, Modules). gen_module_code(ModulePath, DefaultDriverMod, - DriversData, Options, IncludePaths) -> - case smerl:for_module(ModulePath, IncludePaths) of + DriversData, Options, IncludePaths, Macros) -> + case smerl:for_module(ModulePath, IncludePaths, Macros) of {ok, C1} -> C2 = preprocess_and_compile(C1), Module = smerl:get_module(C2), src/erlydb/erlydb.erl @@ -5,7 +5,7 @@ %% For license information see LICENSE.txt -module(erlyweb_compile). --export([compile/2, get_app_data_module/1, compile_file/5]). +-export([compile/2, get_app_data_module/1, compile_file/5, compile_file/6]). -include_lib("kernel/include/file.hrl"). @@ -24,6 +24,13 @@ compile(AppDir, Options) -> Other -> lists:reverse([$/ | Other]) end, + Macros = + lists:foldl( + fun({d, M}, Acc) -> [{M, true} | Acc]; + ({d, M, V}, Acc) -> [{M, V} | Acc]; + (_, Acc) -> Acc + end, [], Options), + IncludePaths = lists:foldl( fun({i, [$/ | _] = Path}, Acc) -> @@ -82,7 +89,7 @@ compile(AppDir, Options) -> AppControllerFilePath = AppDir1 ++ "src/" ++ AppControllerFile, case compile_file(AppControllerFilePath, AppControllerStr, ".erl", undefined, - LastCompileTimeInSeconds, Options3, IncludePaths) of + LastCompileTimeInSeconds, Options3, IncludePaths, Macros) of {ok, _} -> ok; {ok, _, _, _} -> ok; ok -> ok; @@ -101,7 +108,7 @@ compile(AppDir, Options) -> if FileName =/= AppControllerFilePath -> compile_component_file( ComponentsDir, http_util:to_lower(FileName), - LastCompileTimeInSeconds, Options3, IncludePaths, + LastCompileTimeInSeconds, Options3, IncludePaths, Macros, Acc); true -> Acc @@ -119,7 +126,7 @@ compile(AppDir, Options) -> {value, {erlydb_driver, Drivers}} -> erlydb:code_gen(lists:reverse(Models), Drivers, - Options3, IncludePaths); + Options3, IncludePaths, Macros); false -> {error, missing_erlydb_driver_option} end end, @@ -315,7 +322,7 @@ addFinalClauses(Clauses, ComponentStr, Exports) -> compile_component_file(ComponentsDir, FileName, LastCompileTimeInSeconds, - Options, IncludePaths, {ComponentTree, Models} = Acc) -> + Options, IncludePaths, Macros, {ComponentTree, Models} = Acc) -> BaseName = filename:rootname(filename:basename(FileName)), Extension = filename:extension(FileName), BaseNameTokens = string:tokens(BaseName, "_"), @@ -332,7 +339,7 @@ compile_component_file(ComponentsDir, FileName, LastCompileTimeInSeconds, other end, case {compile_file(FileName, BaseName, Extension, Type, - LastCompileTimeInSeconds, Options, IncludePaths), + LastCompileTimeInSeconds, Options, IncludePaths, Macros), Type} of {{ok, Module}, controller} -> [{exports, Exports} | _] = @@ -362,11 +369,11 @@ compile_component_file(ComponentsDir, FileName, LastCompileTimeInSeconds, end. compile_file(_FileName, [$. | _] = BaseName, _Extension, _Type, -_LastCompileTimeInSeconds, _Options, _IncludePaths) -> +_LastCompileTimeInSeconds, _Options, _IncludePaths, _Macros) -> ?Debug("Ignoring file ~p", [BaseName]), {ok, ignore}; compile_file(FileName, BaseName, Extension, Type, - LastCompileTimeInSeconds, Options, IncludePaths) -> + LastCompileTimeInSeconds, Options, IncludePaths, Macros) -> case should_compile(FileName,BaseName,LastCompileTimeInSeconds) of true -> case Extension of @@ -378,7 +385,7 @@ compile_file(FileName, BaseName, Extension, Type, ".erl" -> ?Debug("Compiling Erlang file ~p", [BaseName]), compile_file(FileName, BaseName, Type, Options, - IncludePaths) + IncludePaths, Macros) end; false -> ok; @@ -387,7 +394,10 @@ compile_file(FileName, BaseName, Extension, Type, end. compile_file(FileName, BaseName, Type, Options, IncludePaths) -> - case smerl:for_file(FileName, IncludePaths) of + compile_file(FileName, BaseName, Type, Options, IncludePaths, []). + +compile_file(FileName, BaseName, Type, Options, IncludePaths, Macros) -> + case smerl:for_file(FileName, IncludePaths, Macros) of {ok, M1} -> M2 = add_forms(Type, BaseName, M1), case smerl:compile(M2, Options) of src/erlyweb/erlyweb_compile.erl @@ -69,8 +69,10 @@ -export([new/1, for_module/1, for_module/2, + for_module/3, for_file/1, - for_file/2, + for_file/2, + for_file/3, get_module/1, set_module/2, get_forms/1, @@ -136,6 +138,10 @@ new(ModuleName) when is_atom(ModuleName) -> for_module(ModuleName) -> for_module(ModuleName, []). +%% @equiv for_module(ModuleName, IncludePaths, []) +for_module(ModuleName, IncludePaths) -> + for_module(ModuleName, IncludePaths, []). + %% @doc Create a meta_mod tuple for an existing module. If ModuleName is a %% string, it is interpreted as a file name (this is the same as calling %% @{link smerl:for_file}). If ModuleName is an atom, Smerl attempts to @@ -146,15 +152,16 @@ for_module(ModuleName) -> %% %% The IncludePaths parameter is used when 'ModuleName' is a file name. %% -%% @spec for_module(ModuleName::atom() | string(), IncludePaths::[string()]) -> +%% @spec for_module(ModuleName::atom() | string(), IncludePaths::[string()], +%% Macros::[{atom(), term()}]) -> %% {ok, meta_mod()} | {error, Error} -for_module(ModuleName, IncludePaths) when is_list(ModuleName) -> - for_file(ModuleName, IncludePaths); -for_module(ModuleName, IncludePaths) when is_atom(ModuleName) -> +for_module(ModuleName, IncludePaths, Macros) when is_list(ModuleName) -> + for_file(ModuleName, IncludePaths, Macros); +for_module(ModuleName, IncludePaths, Macros) when is_atom(ModuleName) -> [_Exports, _Imports, _Attributes, {compile, [_Options, _Version, _Time, {source, Path}]}] = ModuleName:module_info(), - case for_file(Path, IncludePaths) of + case for_file(Path, IncludePaths, Macros) of {ok, _Mod} = Res-> Res; _Err -> @@ -175,13 +182,18 @@ for_module(ModuleName, IncludePaths) when is_atom(ModuleName) -> for_file(SrcFilePath) -> for_file(SrcFilePath, []). +%% @equiv for_file(SrcFilePath, IncludePaths, []) +for_file(SrcFilePath, IncludePaths) -> + for_file(SrcFilePath, IncludePaths, []). + %% @doc Create a meta_mod for a module from its source file. %% -%% @spec for_file(SrcFilePath::string(), IncludePaths::[string()]) -> +%% @spec for_file(SrcFilePath::string(), IncludePaths::[string()], +%% Macros::[{atom(), term()}]) -> %% {ok, meta_mod()} | {error, invalid_module} -for_file(SrcFilePath, IncludePaths) -> +for_file(SrcFilePath, IncludePaths, Macros) -> case epp:parse_file(SrcFilePath, [filename:dirname(SrcFilePath) | - IncludePaths], []) of + IncludePaths], Macros) of {ok, Forms} -> mod_for_forms(Forms); _err -> src/smerl/smerl.erl 093a8f5830992865be751cd06b08f2002c3b26e6 yarivvv yarivvv http://github.com/yariv/erlyweb/commit/486879d493169f242e552c762860b5c759703b43 486879d493169f242e552c762860b5c759703b43 2008-10-04T15:46:20-07:00 2008-10-04T15:46:20-07:00 applied patches for macro defs support 7d86f1cb5a371c23af396b0bde13732be64e11b6 yarivvv yarivvv