Browse Source

bugfixes

git-svn-id: http://erlydtl.googlecode.com/svn/trunk@22 a5195066-8e3e-0410-a82a-05b01b1b9875
rsaccon 17 years ago
parent
commit
26b107f0e3
3 changed files with 10 additions and 6 deletions
  1. 7 0
      demo/out/test_for.html
  2. 2 2
      src/demo/erlydtl_demo.erl
  3. 1 4
      src/erlydtl/erlydtl_server.erl

+ 7 - 0
demo/out/test_for.html

@@ -0,0 +1,7 @@
+before
+
+<ul>
+
+</ul>
+
+after

+ 2 - 2
src/demo/erlydtl_demo.erl

@@ -91,7 +91,7 @@ render() ->
     render("simple", ".html"),
     render("simple", ".html"),
     render("htmltags", ".html"),
     render("htmltags", ".html"),
     render("csstags", ".css"),
     render("csstags", ".css"),
-    render("for", ".html", ["apple", "banana"]).
+    render("for", ".html"). %, ["apple", "banana"]).
         
         
 
 
 %%--------------------------------------------------------------------
 %%--------------------------------------------------------------------
@@ -118,7 +118,7 @@ render("csstags" = Name) ->
     render(Name, ".html");    
     render(Name, ".html");    
                     
                     
 render("for" = Name) ->
 render("for" = Name) ->
-    render(Name, ".html", ["apple", "banana"]).
+    render(Name, ".html"). %, ["apple", "banana"]).
 
 
 
 
 %%--------------------------------------------------------------------
 %%--------------------------------------------------------------------

+ 1 - 4
src/erlydtl/erlydtl_server.erl

@@ -304,11 +304,9 @@ build_tree([H | T], [Token], Out, Args, DocRoot, Ext) ->
 parse_transform({block, _Line, Name, [nil, Val]}, List, Args, Ext) ->
 parse_transform({block, _Line, Name, [nil, Val]}, List, Args, Ext) ->
 	case lists:keysearch(Name, 3, List) of
 	case lists:keysearch(Name, 3, List) of
 		false -> 
 		false -> 
-            %% {Val, Args};
             parse_transform(Val, List, Args, Ext);
             parse_transform(Val, List, Args, Ext);
 		{value, {_, _, _, [H | T]}} ->  
 		{value, {_, _, _, [H | T]}} ->  
 		    {_, List2, Args2} = build_tree(H, T, [], Args, undefined, Ext),
 		    {_, List2, Args2} = build_tree(H, T, [], Args, undefined, Ext),
-            %% {lists:reverse(List2), Args2} 
             parse_transform(lists:reverse(List2), List, Args2, Ext)
             parse_transform(lists:reverse(List2), List, Args2, Ext)
  	end;
  	end;
 parse_transform({string, Val}, _, Args, _) ->    
 parse_transform({string, Val}, _, Args, _) ->    
@@ -324,8 +322,6 @@ parse_transform({var, Line, Var}, Var1, Var) when is_atom(Var1) ->
 parse_transform({var, Line, Var}, Args) ->
 parse_transform({var, Line, Var}, Args) ->
     {value, {_, Val}} = lists:keysearch(Var, 1, Args),
     {value, {_, Val}} = lists:keysearch(Var, 1, Args),
     binary_string(Val);      
     binary_string(Val);      
-parse_transform({string, Val}, _) ->    
-    binary_string(Val);
 parse_transform(Other, _) ->    
 parse_transform(Other, _) ->    
     Other.
     Other.
         
         
@@ -339,6 +335,7 @@ parse_transform({var, L, Val}) ->
 parse_transform(Other) ->    
 parse_transform(Other) ->    
     Other.   	
     Other.   	
 
 
+
 binary_string(Val) ->
 binary_string(Val) ->
     erl_syntax:binary([erl_syntax:binary_field(erl_syntax:integer(X)) || X <- Val]).
     erl_syntax:binary([erl_syntax:binary_field(erl_syntax:integer(X)) || X <- Val]).