Skip to content

Commit

Permalink
Made resolver internal to filegroup
Browse files Browse the repository at this point in the history
  • Loading branch information
Steve Cohen committed Nov 14, 2016
1 parent a5646f2 commit ddac3ae
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 4 additions & 1 deletion lib/parser/file_group.ex
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ defmodule Thrift.Parser.FileGroup do

defstruct resolver: nil, initial_file: nil, parsed_files: %{}, schemas: %{}, resolutions: %{}

def new(initial_file, resolver) do
def new(initial_file) do
{:ok, resolver} = Resolver.start_link()
%FileGroup{initial_file: initial_file, resolver: resolver}
end

Expand Down Expand Up @@ -70,6 +71,8 @@ defmodule Thrift.Parser.FileGroup do
|> Map.new

resolutions = Map.merge(resolutions, to_update)
Resolver.stop(file_group.resolver)

%FileGroup{file_group | resolutions: resolutions}
end

Expand Down
5 changes: 1 addition & 4 deletions lib/parser/parser.ex
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,14 @@ defmodule Thrift.Parser do
"""
@spec parse_file(Path.t) :: %FileGroup{}
def parse_file(file_path) do
{:ok, resolver} = Resolver.start_link()

parsed_file = file_path
|> FileRef.new
|> ParsedFile.new

file_group = FileGroup.new(file_path, resolver)
file_group = FileGroup.new(file_path)
|> FileGroup.add(parsed_file)

file_group = FileGroup.update_resolutions(file_group)
Resolver.stop(resolver)
file_group
end
end

0 comments on commit ddac3ae

Please sign in to comment.