Browse Source

Only list global variables (fixes #118)

Andreas Stenius 11 years ago
parent
commit
274bd52651
1 changed files with 14 additions and 13 deletions
  1. 14 13
      src/erlydtl_beam_compiler.erl

+ 14 - 13
src/erlydtl_beam_compiler.erl

@@ -1072,19 +1072,20 @@ resolve_variable_ast1({attribute, {{_, Pos, Attr}, Variable}}, {Runtime, Finder}
      TreeWalker1};
      TreeWalker1};
 
 
 resolve_variable_ast1({variable, {identifier, Pos, VarName}}, {Runtime, Finder}, TreeWalker) ->
 resolve_variable_ast1({variable, {identifier, Pos, VarName}}, {Runtime, Finder}, TreeWalker) ->
-    VarValue = case resolve_variable(VarName, TreeWalker) of
-                   undefined ->
-                       FileName = get_current_file(TreeWalker),
-                       ?Q(["'@Runtime@':'@Finder@'(",
-                           "  _@VarName@, _Variables,",
-                           "  [{filename, _@FileName@},",
-                           "   {pos, _@Pos@},",
-                           "   {record_info, _RecordInfo},",
-                           "   {render_options, RenderOptions}])"]);
-                   Val ->
-                       Val
-               end,
-    {{VarValue, #ast_info{ var_names=[VarName] }}, TreeWalker}.
+    Ast = case resolve_variable(VarName, TreeWalker) of
+              undefined ->
+                  FileName = get_current_file(TreeWalker),
+                  {?Q(["'@Runtime@':'@Finder@'(",
+                       "  _@VarName@, _Variables,",
+                       "  [{filename, _@FileName@},",
+                       "   {pos, _@Pos@},",
+                       "   {record_info, _RecordInfo},",
+                       "   {render_options, RenderOptions}])"]),
+                   #ast_info{ var_names=[VarName] }};
+              Val ->
+                  {Val, #ast_info{}}
+          end,
+    {Ast, TreeWalker}.
 
 
 format(Ast, TreeWalker) ->
 format(Ast, TreeWalker) ->
     auto_escape(format_number_ast(Ast), TreeWalker).
     auto_escape(format_number_ast(Ast), TreeWalker).