Roberto Saccon 17 лет назад
Родитель
Сommit
216e0e5f2c

+ 1 - 1
src/demo/erlydtl_demo.erl

@@ -72,7 +72,7 @@ compile("comment" = Name) ->
     compile(Name, ".html");
                
 compile("for" = Name) ->
-    compile(Name, ".css");
+    compile(Name, ".html");
                         
 compile("htmltags" = Name) ->
     compile(Name, ".html");

+ 1 - 1
src/erlydtl/erlydtl_parser.erl

@@ -32,7 +32,7 @@ tag({_, Line, [TagName | Args]}) ->
     {tag, Line, TagName, Args2}.
 
 for({_, Line, [Iterator, _, Var]}, Content) ->
-    {for, Line, list_to_atom(Iterator), list_to_atom(Var), Content}.
+    {for, Line, list_to_atom("A" ++ Iterator), list_to_atom("A" ++ Var), Content}.
 -file("/Users/rsaccon/R11B/erlang/lib/parsetools-1.4.1.1/include/yeccpre.hrl", 0).
 %% ``The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in

+ 1 - 1
src/erlydtl/erlydtl_parser.yrl

@@ -97,4 +97,4 @@ tag({_, Line, [TagName | Args]}) ->
     {tag, Line, TagName, Args2}.
 
 for({_, Line, [Iterator, _, Var]}, Content) ->
-    {for, Line, list_to_atom(Iterator), list_to_atom(Var), Content}.
+    {for, Line, list_to_atom("A" ++ Iterator), list_to_atom("A" ++ Var), Content}.

+ 4 - 5
src/erlydtl/erlydtl_server.erl

@@ -219,7 +219,6 @@ compile([H | T], ModuleName, FunctionName, RelDir, Ext) ->
 	[Mod, Cmp] = [erl_syntax:attribute(erl_syntax:atom(X), [erl_syntax:atom(Y)]) ||
 	    {X, Y} <- [{"module", ModuleName}, {"compile", "export_all"}]],
     Forms = [erl_syntax:revert(X) || X <- [Mod, Cmp, Func]],
-io:format("TRACE ~p:~p ~p~n",[?MODULE, ?LINE, Forms]),
     case compile:forms(Forms) of
         {ok, Module, Bin} ->
             erlydtl_tools:write_beam(Module, Bin, "ebin"),
@@ -266,7 +265,7 @@ build_tree(nil, [{for, _Line, Iterator, Var, [HFor | TFor]}], Out, Args, _, Ext,
             Args1;
         _ ->
             [Var | Args1]
-	end,     
+	end,    
     Body = erl_syntax:generator(erl_syntax:variable(Iterator), erl_syntax:variable(Var)),  
     Out1 = erl_syntax:list_comp(erl_syntax:list(List1), [Body]),
     {regular, Out1, Args2};   
@@ -292,7 +291,7 @@ build_tree([H | T], [{tag, _Line, TagName, TagArgs}], Out, Args, DocRoot, Ext, I
     Out2 = load_tag(TagName, TagArgs, Out, default, Ext, IgnoreVar),
     build_tree(H, T, Out2, Args, DocRoot, Ext, IgnoreVar);
  
-build_tree([H | T], [{for, _Line, Iterator, Var, [HFor | TFor]}], Out, Args, DocRoot, Ext, IgnoreVar) -> 	
+build_tree([H | T], [{for, _Line, Iterator, Var, [HFor | TFor]}], Out, Args, DocRoot, Ext, IgnoreVar) -> 
     {_, List1, Args1} = build_tree(HFor, TFor, [], Args, undefined, Ext, Iterator),  
     Args2 = case lists:member(Var, Args1) of
         true ->
@@ -362,8 +361,8 @@ load_tag(TagName, TagArgs, Acc0, default, Ext, IgnoreVar) ->
   
     
 binary_string(String) ->
-    erl_syntax:string(String).
-%    erl_syntax:binary([erl_syntax:binary_field(erl_syntax:integer(X)) || X <- String]).
+%    erl_syntax:string(String).
+    erl_syntax:binary([erl_syntax:binary_field(erl_syntax:integer(X)) || X <- String]).
 
 
 rel_dir(Dir, DocRoot) when Dir =:= DocRoot ->