Fix file-inclusion bugs

ErlyORM · Jun 24, 2010 · ee70b62 · ee70b62
1 parent 4d7970c
commit ee70b62
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/aleppo.erl b/src/aleppo.erl
@@ -130,19 +130,21 @@ process_inclusion(FileName, Line, Context) ->
             {NewTokens, _} = mark_keywords(Tokens),
             case aleppo_parser:parse(NewTokens) of
                 {ok, ParseTree} ->
+                    [{eof, _}|Rest] = lists:reverse(ParseTree),
+                    ParseTreeNoEOF = lists:reverse(Rest),
                     ThisFile = case dict:find('FILE', Context#ale_context.macro_dict) of
                         {ok, Val} -> Val;
                         _ -> undefined
                     end,
                     Dict1 = dict:store('FILE', [{string, 1, FileName}], Context#ale_context.macro_dict),
                     TokenAcc = lists:reverse(file_attribute_tokens(FileName, 1)),
-                    {Dict2, IncludedTokens} = process_tree(ParseTree, TokenAcc, 
+                    {Dict2, IncludedTokens} = process_tree(ParseTreeNoEOF, TokenAcc, 
                         Context#ale_context{ 
                             macro_dict = Dict1, 
                             include_trail = [FileName|Context#ale_context.include_trail]}),
                     case ThisFile of
                         undefined -> {Dict2, IncludedTokens};
-                        {string, _Loc, ThisFileName} -> 
+                        [{string, _Loc, ThisFileName}] -> 
                             {dict:store('FILE', ThisFile, Dict2),
                                 lists:reverse(file_attribute_tokens(ThisFileName, Line)) ++ IncludedTokens}
                     end;