Fix names after rebase to gradient

Author: Premwoik

lib/gradient.ex

@@ -7,9 +7,9 @@ defmodule Gradient do
   - `code_path` - Path to a file with code (e.g. when beam was compiled without project).
   """
 
-  alias GradualizerEx.ElixirFileUtils
-  alias GradualizerEx.ElixirFmt
-  alias GradualizerEx.AstSpecifier
+  alias Gradient.ElixirFileUtils
+  alias Gradient.ElixirFmt
+  alias Gradient.AstSpecifier
 
   require Logger
 

lib/gradualizer_ex/ast_specifier.ex renamed to lib/gradient/ast_specifier.ex

@@ -1,8 +1,4 @@
-<<<<<<< HEAD:lib/gradient/specify_erl_ast.ex
-defmodule Gradient.SpecifyErlAst do
-=======
-defmodule GradualizerEx.AstSpecifier do
->>>>>>> 9a63ccd (Code refactoring, Add docs):lib/gradualizer_ex/ast_specifier.ex
+defmodule Gradient.AstSpecifier do
   @moduledoc """
   Module adds missing location information to the Erlang abstract code produced
   from Elixir AST. Moreover it can be used to catch some ast pattern and replace 
@@ -48,15 +44,11 @@ defmodule GradualizerEx.AstSpecifier do
   - guards [X]
   """
 
-<<<<<<< HEAD:lib/gradient/specify_erl_ast.ex
-  import Gradient.Utils
-=======
-  import GradualizerEx.Tokens
->>>>>>> 9a63ccd (Code refactoring, Add docs):lib/gradualizer_ex/ast_specifier.ex
+  import Gradient.Tokens
 
   require Logger
 
-  alias GradualizerEx.Types
+  alias Gradient.Types
 
   @type token :: Types.token()
   @type tokens :: Types.tokens()
@@ -75,13 +67,8 @@ defmodule GradualizerEx.AstSpecifier do
     with {:attribute, line, :file, {path, _}} <- hd(forms),
          path <- to_string(path),
          {:ok, code} <- File.read(path),
-<<<<<<< HEAD:lib/gradient/specify_erl_ast.ex
          {:ok, tokens} <- :elixir.string_to_tokens(String.to_charlist(code), line, line, path, []) do
-      add_missing_loc_literals(forms, tokens)
-=======
-         {:ok, tokens} <- :elixir.string_to_tokens(String.to_charlist(code), 1, 1, path, []) do
       run_mappers(forms, tokens)
->>>>>>> 9a63ccd (Code refactoring, Add docs):lib/gradualizer_ex/ast_specifier.ex
     else
       error ->
         IO.puts("Error occured when specifying forms : #{inspect(error)}")

lib/gradient/elixir_fmt.ex

@@ -5,7 +5,7 @@ defmodule Gradient.ElixirFmt do
   @behaviour Gradient.Fmt
 
   alias :gradualizer_fmt, as: FmtLib
-  alias GradualizerEx.ElixirType
+  alias Gradient.ElixirType
 
   def print_errors(errors, opts) do
     for {file, e} <- errors do

lib/gradualizer_ex/elixir_type.ex renamed to lib/gradient/elixir_type.ex

@@ -1,4 +1,4 @@
-defmodule GradualizerEx.ElixirType do
+defmodule Gradient.ElixirType do
   @moduledoc """
   Module to format types.