Use merl [1] for compiling the erlang AST tree (fixes #123).

Also, `number_literals` are now converted to erlang integers in the scanner.

[1] https://github.com/richcarl/merl

.travis.yml

@@ -1,7 +1,11 @@
 language: erlang
 otp_release:
-#  - R16B03 (not yet available on travis)
+#  - 17.0-rc1
+  - R16B03-1
   - R16B02
   - R15B03
 #  - R14B04 (seems lists:concat/1 is broken on R14B04..)
-script: "make test"
+
+# since Travis is naughty and calls rebar get-deps behind our backs,
+# we'll have to clean it up and build merl our selves..
+script: "make -C deps/merl && make test"

Makefile

@@ -4,20 +4,28 @@ REBAR=./rebar $(REBAR_ARGS)
 
 all: compile
 
-compile: check-slex
+compile: check-slex deps/merl
 	@$(REBAR) compile
 
 check-slex: src/erlydtl_scanner.erl
 src/erlydtl_scanner.erl: src/erlydtl_scanner.slex
 	@echo Notice: $@ is outdated by $<, consider running "'make slex'".
 
+deps/merl:
+	@$(REBAR) get-deps
+	@echo "Make merl..." ; $(MAKE) -C deps/merl
+
+update:
+	@$(REBAR) update-deps
+	@echo "Make merl..." ; $(MAKE) -C deps/merl
+
 compile_test:
 	-mkdir -p ebintest
 	$(ERLC) -o tests/src -I include/erlydtl_preparser.hrl tests/src/erlydtl_extension_testparser.yrl
 	$(ERL) -make
 
 test: compile compile_test
-	$(ERL) -noshell -pa ebin -pa ebintest \
+	$(ERL) -noshell -pa ebin -pa ebintest -pa deps/merl/ebin \
 		-eval \
 		"try \
 			erlydtl_functional_tests:run_tests(), \
@@ -43,6 +51,7 @@ plt:
 		tools webtool hipe inets eunit
 
 clean:
+	@echo "Clean merl..." ; $(MAKE) -C deps/merl clean
 	@$(REBAR) clean
 	rm -fv ebintest/*
 	rm -fv erl_crash.dump

rebar.config

@@ -2,3 +2,8 @@
 
 {erl_opts, [debug_info]}.
 {yrl_opts, [{includefile, "include/erlydtl_preparser.hrl"}]}.
+{deps,
+ [{merl, ".*",
+   {git, "git://github.com/erlydtl/merl.git", {branch, "erlydtl"}},
+   [raw]}
+ ]}.

src/erlydtl_scanner.erl

@@ -36,7 +36,7 @@
 %%%-------------------------------------------------------------------
 -module(erlydtl_scanner).
 
-%% This file was generated 2014-02-17 11:20:49 UTC by slex 0.2.1.
+%% This file was generated 2014-02-21 13:38:27 UTC by slex 0.2.1.
 %% http://github.com/erlydtl/slex
 -slex_source(["src/erlydtl_scanner.slex"]).
 
@@ -532,7 +532,10 @@ post_process(_, {string, _, L} = T, _) ->
 post_process(_, {string_literal, _, L} = T, _) ->
     setelement(3, T, begin L1 = lists:reverse(L), L1 end);
 post_process(_, {number_literal, _, L} = T, _) ->
-    setelement(3, T, begin L1 = lists:reverse(L), L1 end);
+    setelement(3, T,
+	       begin
+		 L1 = lists:reverse(L), L2 = list_to_integer(L1), L2
+	       end);
 post_process(_, {open_var, _, L} = T, _) ->
     setelement(3, T, begin L1 = to_atom(L), L1 end);
 post_process(_, {close_var, _, L} = T, _) ->

src/erlydtl_scanner.slex

@@ -257,7 +257,7 @@ end.
 
 string: lists reverse.
 string_literal: lists reverse.
-number_literal: lists reverse.
+number_literal: lists reverse, list_to_integer.
 open_var: to_atom.
 close_var: to_atom.
 open_tag: to_atom.

tests/src/erlydtl_functional_tests.erl

@@ -256,7 +256,7 @@ test_compile_render(Name) ->
                        force_recompile,
                        return_errors,
                        return_warnings,
-                       %% debug_compiler,
+                       %% debug_info,
                        {custom_tags_modules, [erlydtl_custom_tags]}],
             io:format("compiling ... "),
             case erlydtl:compile(File, Module, Options) of