Browse Source

bug-fixes, now all tests / demos work again

Roberto Saccon 17 years ago
parent
commit
e12f553038
2 changed files with 4 additions and 6 deletions
  1. 1 2
      src/demo/erlydtl_demo.erl
  2. 3 4
      src/erlydtl/erlydtl_server.erl

+ 1 - 2
src/demo/erlydtl_demo.erl

@@ -181,8 +181,7 @@ render2(OutDir, Module, Ext, Arg) ->
             case file:open(filename:join([OutDir, lists:concat([Module, Ext])]), [write]) of
         		{ok, IoDev} ->
         		    file:write(IoDev, Val),
-        		    file:close(IoDev),
-        		    io:format("TRACE ~p:~p ~p: success~n",[?MODULE, ?LINE, Module]);
+        		    file:close(IoDev);        		    
         		_ ->
         		    io:format("TRACE ~p:~p ~p: file write failure~n",[?MODULE, ?LINE, Module])
         	end

+ 3 - 4
src/erlydtl/erlydtl_server.erl

@@ -353,13 +353,12 @@ build_tree([H | T], [Token], Out, Args, DocRoot, Ext, IgnoreVar, Rec) ->
 
 
 parse_transform({block, _Line, Name, [nil, Val]}, List, Args, Ext, IgnoreVar, Rec) ->
-    %io:format("TRACE ~p:~p block: ~p~n",[?MODULE, ?LINE, {Name, Val, List, Args, Ext, IgnoreVar, Rec}]),
 	case lists:keysearch(Name, 3, List) of
 		false -> 
             parse_transform(Val, List, Args, Ext, IgnoreVar, Rec);
-		{value, {_, _, _, [H | T]}} ->  
-		    {_, List2, Args2} = build_tree(H, T, [], Args, undefined, Ext, IgnoreVar, Rec),
-            parse_transform(lists:reverse(List2), List, Args2, Ext, IgnoreVar, Rec)
+		{value, {_, _, _, [H | T]}} -> 
+		    {_, List2, Args2, Rec1} = build_tree(H, T, [], Args, undefined, Ext, IgnoreVar, Rec),
+            parse_transform(lists:reverse(List2), List, Args2, Ext, IgnoreVar, Rec1)
  	end;
 parse_transform(Other, _What, Args, _, _, _) ->    
     {Other, Args}.