9 years ago · f5f32675a9
--- a/src/erlydtl_beam_compiler.erl
+++ b/src/erlydtl_beam_compiler.erl
@@ -722,7 +722,7 @@ body_ast(DjangoParseTree, BodyScope, TreeWalker) ->
 
				           end, #ast_info{}, AstInfoList),
			
 
				 
			
 
				     {Ast, TreeWalker2} = end_scope(
			
 
				-                           fun ([ScopeVars|ScopeBody]) -> [?Q("begin _@ScopeVars, [_@ScopeBody] end")] end,
			
 
				+                           fun ([ScopeVars|ScopeBody]) -> [?Q("(fun() -> _@ScopeVars, [_@ScopeBody] end)()")] end,
			
 
				                            ScopeId, AstList, TreeWalker1),
			
 
				     {{erl_syntax:list(Ast), Info}, TreeWalker2}.
			
 
				 
			
--- a/test/erlydtl_test_defs.erl
+++ b/test/erlydtl_test_defs.erl
@@ -1798,8 +1798,8 @@ all_test_defs() ->
 
				                 "custom_tag3", "custom_tag4", "custom_tag_var", "custom_tag_lib_var", "custom_call", "include_template", "include_path",
			
 
				                 "ssi", "extends_path", "extends_path2", "trans", "extends_for", "extends2",
			
 
				                 "extends3", "recursive_block", "extend_recursive_block", "missing", "block_super",
			
 
				-                "wrapper", "extends4", "super_escaped", "extends_chain", "reader_options", "ssi_reader_options"]
			
 
				-
			
 
				+                "wrapper", "extends4", "super_escaped", "extends_chain", "reader_options", "ssi_reader_options",
			
 
				+                "extend_doubleblock"]
			
 
				       ]},
			
 
				      {"compile_dir",
			
 
				       [setup_compile(T)
			
@@ -2032,6 +2032,8 @@ setup_compile("reader_options") ->
 
				  {ok, [[]|[{compile_opts, [{reader, {?MODULE, extra_reader}}, {reader_options, [{user_id, <<"007">>}, {user_name, <<"Agent">>}]}]}]]};
			
 
				 setup_compile("ssi_reader_options") ->
			
 
				  {ok, [[]|[{compile_opts, [{reader, {?MODULE, extra_reader}}, {reader_options, [{user_id, <<"007">>}, {user_name, <<"Agent">>}]}]}]]};
			
 
				+%%setup_compile("extend_doubleblock") ->
			
 
				+%%    {ok, [[]|[{compile_opts, [debug_compiler]}]]};
			
 
				 setup_compile(_) ->
			
 
				     {ok, [[]]}.
			
 
				 
			
--- a/test/files/expect/extend_doubleblock
+++ b/test/files/expect/extend_doubleblock
@@ -0,0 +1,6 @@
 
				+<head>
			
 
				+  <title>Chicago Boss Admin - General Info</title>
			
 
				+</head>
			
 
				+<body>
			
 
				+  <h1>Chicago Boss Admin - General Info</h1>
			
 
				+</body>
			
--- a/test/files/input/base_doubleblock
+++ b/test/files/input/base_doubleblock
@@ -0,0 +1,6 @@
 
				+<head>
			
 
				+  <title>Chicago Boss Admin - {% block title %}{% endblock %}</title>
			
 
				+</head>
			
 
				+<body>
			
 
				+  <h1>Chicago Boss Admin - {% block title %}{% endblock %}</h1>
			
 
				+</body>
			
--- a/test/files/input/extend_doubleblock
+++ b/test/files/input/extend_doubleblock
@@ -0,0 +1,2 @@
 
				+{% extends "base_doubleblock" %}
			
 
				+{% block title %}General Info{% endblock %}