Permalink
Browse files

Merge remote-tracking branch 'klaustrainer/next' into rv

* klaustrainer/next:
  Fix issue with `:joxify` element in require

Signed-off-by: Eric Merritt <ericbmerritt@gmail.com>
  • Loading branch information...
2 parents 1ad14e6 + 224c773 commit a06a04b90a28dc8d18a01d5babed444937ba2f42 @ericbmerritt committed Oct 1, 2012
Showing with 10 additions and 4 deletions.
  1. +5 −2 src/joxa-compiler.jxa
  2. +5 −2 test/jxat_module_info.erl
View
7 src/joxa-compiler.jxa
@@ -4459,8 +4459,11 @@ errors in a generated function will always be the line number of the macro."
((namespace-name . rest)
(when (erlang/is_atom namespace-name))
(get-require rest (namespace-name . acc)))
- (([namespace-name [quote as] _] . rest)
- (when (erlang/is_atom namespace-name))
+ (([namespace-name [:quote :joxify]] . rest)
+ (when (erlang/is_atom namespace-name))
+ (get-require rest (namespace-name . acc)))
+ (([namespace-name [:quote :as] _] . rest)
+ (when (erlang/is_atom namespace-name))
(get-require rest (namespace-name . acc)))
(_
acc)))
View
7 test/jxat_module_info.erl
@@ -14,7 +14,10 @@ given([a,module,that,has,a,require,'and',use], _State, _) ->
(phash2 :bar))
(ns jxat-case-test2
- (require lists code)
+ (require
+ (lists :joxify)
+ code
+ (erl_prim_loader :as loader))
(use (erlang :only (==/2 phash2/1 and/2))))
(defn internal-test (arg1 arg2)
@@ -31,5 +34,5 @@ then([context,is,produced], Deps, _) ->
?assertMatch(true, erlang:is_list(Deps)),
{ok, Deps};
then([context,contains,the,required,information], Deps, _) ->
- ?assertMatch([{'jxat-case-test2',[erlang,code,lists]},
+ ?assertMatch([{'jxat-case-test2',[erlang,erl_prim_loader,code,lists]},
{'jxat-case-test',[erlang,jxat_module_info]}], Deps).

0 comments on commit a06a04b

Please sign in to comment.