Refactor how location of nodes are calculated.

benchmark/benchmark_core_parsing.cr

@@ -0,0 +1,14 @@
+require "benchmark"
+require "../src/all"
+
+module Mint
+  Benchmark.ips(warmup: 4.seconds, calculation: 10.seconds) do |x|
+    x.report("Core parsing") do
+      Core.files.reduce(Ast.new) do |memo, file|
+        Parser.parse(file.read, file.path).try do |ast|
+          memo.merge(ast)
+        end
+      end
+    end
+  end
+end

spec/ast/node_spec.cr

@@ -12,32 +12,31 @@ describe Mint::Ast::Node do
         }
         MINT
 
-      location =
+      node =
         Mint::Parser
           .parse(example, "example.mint")
           .components
           .first
           .functions
           .first
-          .location
 
-      location.start.should eq({2, 2})
+      {node.from.line, node.from.column}.should eq({2, 2})
 
       # actually {4, 2} but all parsers go over by 1
-      location.end.should eq({4, 3})
+      {node.to.line, node.to.column}.should eq({4, 3})
 
       # First line
-      location.contains?(2, 1).should eq(false) # space before `f`
-      location.contains?(2, 3).should eq(true)  # `f` of `fun`
+      node.contains?(2, 1).should eq(false) # space before `f`
+      node.contains?(2, 3).should eq(true)  # `f` of `fun`
 
       # Middle line
-      location.contains?(3, 0).should eq(true)
-      location.contains?(3, 9).should eq(true)
-      location.contains?(3, 1000).should eq(true)
+      node.contains?(3, 0).should eq(true)
+      node.contains?(3, 9).should eq(true)
+      node.contains?(3, 1000).should eq(true)
 
       # End line
-      location.contains?(4, 2).should eq(true)  # `}`
-      location.contains?(4, 3).should eq(false) # space after `}`
+      node.contains?(4, 2).should eq(true)  # `}`
+      node.contains?(4, 3).should eq(false) # space after `}`
     end
   end
 end

src/ast.cr

@@ -5,9 +5,9 @@ module Mint
 
     getter unified_modules, unified_locales
 
-    def initialize(@type_definitions = [] of TypeDefinition,
-                   @operators = [] of Tuple(Int64, Int64),
-                   @keywords = [] of Tuple(Int64, Int64),
+    def initialize(@operators = [] of {from: Parser::Location, to: Parser::Location},
+                   @keywords = [] of {from: Parser::Location, to: Parser::Location},
+                   @type_definitions = [] of TypeDefinition,
                    @unified_modules = [] of Module,
                    @unified_locales = [] of Locale,
                    @components = [] of Component,
@@ -21,26 +21,12 @@ module Mint
                    @nodes = [] of Node)
     end
 
-    def main : Component?
-      @components.find(&.name.value.==("Main"))
-    end
-
     def self.space_separated?(node1, node2)
-      node1.file.contents[node1.to, node2.from - node1.to].count('\n') > 1
+      (node2.from.line - node1.to.line) > 1
     end
 
-    def self.new_line?(node1, node2)
-      node1.file.contents[node1.from, node2.from - node1.from].includes?('\n')
-    end
-
-    def new_line?(node1, node2)
-      start_position =
-        node1.from
-
-      count =
-        node2.to - node1.from
-
-      node1.file.contents[start_position, count].includes?('\n')
+    def main : Component?
+      @components.find(&.name.value.==("Main"))
     end
 
     def merge(ast) : self
@@ -68,7 +54,7 @@ module Mint
       path : String,
       line : Int64
     ) : Array(Ast::Node)
-      nodes_at_path(path).select!(&.location.contains?(line, column))
+      nodes_at_path(path).select!(&.contains?(line, column))
     end
 
     def nodes_at_path(path : String) : Array(Ast::Node)
@@ -93,17 +79,16 @@ module Mint
           .group_by(&.name.value)
           .map do |_, modules|
             Module.new(
-              functions: modules.flat_map(&.functions),
-              constants: modules.flat_map(&.constants),
-              file: Parser::File.new(contents: "", path: ""),
               # TODO: We may need to store each modules name node for
               # future features, but for now we just store the first
               comment: modules.compact_map(&.comment).first?,
+              file: Parser::File.new(contents: "", path: ""),
+              functions: modules.flat_map(&.functions),
+              constants: modules.flat_map(&.constants),
+              from: Parser::Location.new,
+              to: Parser::Location.new,
               name: modules.first.name,
-              comments: [] of Comment,
-              from: 0,
-              to: 0,
-            )
+              comments: [] of Comment)
           end
 
       @unified_locales =
@@ -114,9 +99,9 @@ module Mint
               file: Parser::File.new(contents: "", path: ""),
               fields: locales.flat_map(&.fields),
               language: locales.first.language,
-              comment: nil,
-              from: 0,
-              to: 0)
+              from: Parser::Location.new,
+              to: Parser::Location.new,
+              comment: nil)
           end
 
       self

src/ast/access.cr

@@ -10,12 +10,12 @@ module Mint
         Dot
       end
 
-      def initialize(@file : Parser::File,
+      def initialize(@from : Parser::Location,
+                     @to : Parser::Location,
+                     @file : Parser::File,
                      @expression : Node,
                      @field : Variable,
-                     @from : Int64,
-                     @type : Type,
-                     @to : Int64)
+                     @type : Type)
       end
     end
   end

src/ast/argument.cr

@@ -3,12 +3,12 @@ module Mint
     class Argument < Node
       getter type, name, default
 
-      def initialize(@file : Parser::File,
+      def initialize(@from : Parser::Location,
+                     @to : Parser::Location,
+                     @file : Parser::File,
                      @default : Node?,
                      @name : Variable,
-                     @from : Int64,
-                     @type : Node,
-                     @to : Int64)
+                     @type : Node)
       end
     end
   end

src/ast/array_destructuring.cr

@@ -3,10 +3,10 @@ module Mint
     class ArrayDestructuring < Node
       getter items
 
-      def initialize(@file : Parser::File,
-                     @items : Array(Node),
-                     @from : Int64,
-                     @to : Int64)
+      def initialize(@from : Parser::Location,
+                     @to : Parser::Location,
+                     @file : Parser::File,
+                     @items : Array(Node))
       end
     end
   end

src/ast/array_literal.cr

@@ -3,11 +3,11 @@ module Mint
     class ArrayLiteral < Node
       getter items, type
 
-      def initialize(@file : Parser::File,
+      def initialize(@from : Parser::Location,
+                     @to : Parser::Location,
+                     @file : Parser::File,
                      @items : Array(Node),
-                     @from : Int64,
-                     @type : Node?,
-                     @to : Int64)
+                     @type : Node?)
       end
     end
   end

src/ast/await.cr

@@ -3,10 +3,10 @@ module Mint
     class Await < Node
       getter body
 
-      def initialize(@file : Parser::File,
-                     @from : Int64,
-                     @body : Node,
-                     @to : Int64)
+      def initialize(@from : Parser::Location,
+                     @to : Parser::Location,
+                     @file : Parser::File,
+                     @body : Node)
       end
     end
   end

src/ast/block.cr

@@ -4,9 +4,9 @@ module Mint
       getter expressions
 
       def initialize(@expressions : Array(Node),
-                     @file : Parser::File,
-                     @from : Int64,
-                     @to : Int64)
+                     @from : Parser::Location,
+                     @to : Parser::Location,
+                     @file : Parser::File)
       end
     end
   end

src/ast/bool_literal.cr

@@ -3,10 +3,10 @@ module Mint
     class BoolLiteral < Node
       getter value
 
-      def initialize(@file : Parser::File,
-                     @value : Bool,
-                     @from : Int64,
-                     @to : Int64)
+      def initialize(@from : Parser::Location,
+                     @to : Parser::Location,
+                     @file : Parser::File,
+                     @value : Bool)
       end
     end
   end

src/ast/bracket_access.cr

@@ -3,11 +3,11 @@ module Mint
     class BracketAccess < Node
       getter index, expression
 
-      def initialize(@file : Parser::File,
+      def initialize(@from : Parser::Location,
+                     @to : Parser::Location,
+                     @file : Parser::File,
                      @expression : Node,
-                     @index : Node,
-                     @from : Int64,
-                     @to : Int64)
+                     @index : Node)
       end
     end
   end

src/ast/builtin.cr

@@ -3,10 +3,10 @@ module Mint
     class Builtin < Node
       getter value
 
-      def initialize(@file : Parser::File,
-                     @value : String,
-                     @from : Int64,
-                     @to : Int64)
+      def initialize(@from : Parser::Location,
+                     @to : Parser::Location,
+                     @file : Parser::File,
+                     @value : String)
       end
     end
   end

src/ast/call.cr

@@ -4,11 +4,11 @@ module Mint
       getter arguments, expression, await
 
       def initialize(@arguments : Array(Field),
+                     @from : Parser::Location,
+                     @to : Parser::Location,
                      @file : Parser::File,
                      @expression : Node,
-                     @await : Bool,
-                     @from : Int64,
-                     @to : Int64)
+                     @await : Bool)
       end
     end
   end

src/ast/case.cr

@@ -5,10 +5,10 @@ module Mint
 
       def initialize(@branches : Array(CaseBranch),
                      @comments : Array(Comment),
+                     @from : Parser::Location,
+                     @to : Parser::Location,
                      @file : Parser::File,
-                     @condition : Node,
-                     @from : Int64,
-                     @to : Int64)
+                     @condition : Node)
       end
     end
   end

src/ast/case_branch.cr

@@ -4,10 +4,10 @@ module Mint
       getter pattern, expression
 
       def initialize(@expression : Node | Array(CssDefinition),
+                     @from : Parser::Location,
+                     @to : Parser::Location,
                      @file : Parser::File,
-                     @pattern : Node?,
-                     @from : Int64,
-                     @to : Int64)
+                     @pattern : Node?)
       end
     end
   end

src/ast/comment.cr

@@ -8,12 +8,12 @@ module Mint
         Block
       end
 
-      def initialize(@next_comment : Comment?,
+      def initialize(@from : Parser::Location,
+                     @next_comment : Comment?,
+                     @to : Parser::Location,
                      @file : Parser::File,
                      @content : String,
-                     @from : Int64,
-                     @type : Type,
-                     @to : Int64)
+                     @type : Type)
       end
 
       def block?

src/ast/component.cr

@@ -12,6 +12,8 @@ module Mint
                      @functions : Array(Function),
                      @comments : Array(Comment),
                      @connects : Array(Connect),
+                     @from : Parser::Location,
+                     @to : Parser::Location,
                      @states : Array(State),
                      @styles : Array(Style),
                      @file : Parser::File,
@@ -21,8 +23,6 @@ module Mint
                      @locales : Bool,
                      @global : Bool,
                      @async : Bool,
-                     @from : Int64,
-                     @to : Int64,
                      @name : Id)
       end
     end

src/ast/connect.cr

@@ -4,10 +4,10 @@ module Mint
       getter keys, store
 
       def initialize(@keys : Array(ConnectVariable),
+                     @from : Parser::Location,
+                     @to : Parser::Location,
                      @file : Parser::File,
-                     @from : Int64,
-                     @store : Id,
-                     @to : Int64)
+                     @store : Id)
       end
     end
   end

src/ast/connect_variable.cr

@@ -3,11 +3,11 @@ module Mint
     class ConnectVariable < Node
       getter target, name
 
-      def initialize(@file : Parser::File,
+      def initialize(@from : Parser::Location,
+                     @to : Parser::Location,
+                     @file : Parser::File,
                      @target : Variable?,
-                     @name : Variable,
-                     @from : Int64,
-                     @to : Int64)
+                     @name : Variable)
       end
     end
   end