lat 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79c0178cf5e3b3e1168af97aec3a318b082b25c43a2835464682f6bdcdf545f7
-  data.tar.gz: ef5b003a8c15b86ffd3575844232bfe909b084844587a114312b35d5d76e113b
+  metadata.gz: c2053d16f88f07ebebeb98b8132ae6bf6adfaecb06d1573be7c0639b73755837
+  data.tar.gz: 02063ec4e1819c2743e426bdbc4b642f4e0862b1ce4cdfd4b02e2aba69abc380
 SHA512:
-  metadata.gz: a8377175fe6c7cb97521c4a51c6a7a5b2ebe0aa1a9bb9c3a0f19299fdd2e7d9f08fc9c5efe86098b716063ea656293d4612fc5575cfb39481d81fadd2282210b
-  data.tar.gz: 50e003a2f76a40427759f032ce0da3355422c481d6089f99d2deb1f1d384ca137478ffc0b14dd64c74ab3c856edc09c19ac99dc8b3665214d608e6b847ab39b7
+  metadata.gz: d080afc37148a4c9cab7daf30cdada85ab226f11a0bc13a7786ba3aa840156fc5b622ab5474dec0e7879926fa0952a09024a463afb93800b11facd0b15336a6c
+  data.tar.gz: 6674298934d89ce7f1f9c1e108e114a64d96330bb7d7e06ce27becd8e8e0f2b89cf2a71a5a0d963427c202ee2586a1cf5b13d824ef4f021168da04b6681f039e

data/bin/lat

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.join(__dir__, "../compiler")
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(__dir__, "../compiler")
 require_relative "../compiler/compile"

data/compiler/codegen.rb

@@ -1,7 +1,22 @@
 class Generator
+
+  def generate_statement(node)
+    code = generate(node)
+    line = node.instance_variable_get(:@lat_line) if node.respond_to?(:instance_variable_get)
+    line ? "--[[@#{line}]]#{code}" : code
+  end
+
+  def generate_arguments(args)
+    args.map { |expr| generate(expr) }.join(",")
+  end
+
+  def generate_param_names(names)
+    names.join(",")
+  end
+
   def generate(node)
     if node.is_a?(Array)
-      return node.map { |n| generate(n) }.join("\n")
+      return node.map { |n| generate_statement(n) }.join("\n")
     end 
 
     case node
@@ -39,20 +54,15 @@ class Generator
      
       out.join("\n")
     when ClassDefNode
-      body_code = node.body.map { |n| generate(n) }.join("\n  ")
-     "function %s(%s)\n  %s\nend" % [node.name, node.args.join(","), body_code]
+      body_code = generate(node.body)
+     "function %s(%s)\n  %s\nend" % [node.name, generate_param_names(node.args), body_code]
 
     when DefNode
-      body_code = 
-        if node.body.is_a?(Array)
-          node.body.map { |n| generate (n) }.join("\n  ")
-        else
-          generate(node.body)
-        end
+      body_code = generate(node.body)
 
       "function #{node.type == "love"? "love." : ""}%s(%s)\n  %s \nend" % [
         node.name,
-        node.args.join(","),
+        generate_param_names(node.args),
         body_code
       ]
 
@@ -61,28 +71,23 @@ class Generator
 
       first = node.condition
       compiled << "if #{generate(first)} then\n  "
-      compiled << node.body.map { |n| generate (n) }.join("\n")
+      compiled << generate(node.body)
 
       node.elif_blocks.each do |c|
         compiled << "\nelseif #{generate(c.condition)} then\n  "
-        compiled << c.body.map { |n| generate (n) }.join("\n")
+        compiled << generate(c.body)
       end
 
       if node.else_body
         compiled << "\nelse\n  "
-        compiled << node.else_body.map { |n| generate (n) }.join("\n")
+        compiled << generate(node.else_body)
       end
 
       compiled << "\nend\n"
       compiled
 
     when WhileNode
-      body_code = 
-      if node.body.is_a?(Array)
-        node.body.map{ |n| generate (n) }.join("\n")
-      else
-        generate(node.body)
-      end
+      body_code = generate(node.body)
 
       "while %s do \n %s \nend" % [
         generate(node.statement),
@@ -90,12 +95,8 @@ class Generator
       ]
 
     when ForNode
-      body_code = 
-      if node.body.is_a?(Array)
-        node.body.map{ |n| generate (n) }.join("\n")
-      else
-        generate(node.body)
-      end
+      body_code = generate(node.body)
+
       increment = ", #{node.step.nil? ? "" : generate(node.step)}"
       "for %s = %s, %s%s do\n %s \nend"  % [
         generate(node.var),
@@ -106,12 +107,7 @@ class Generator
       ]
 
     when ForPairNode
-      body_code = 
-      if node.body.is_a?(Array)
-        node.body.map{ |n| generate (n) }.join("\n")
-      else
-        generate(node.body)
-      end
+      body_code = generate(node.body)
       "for %s, %s in pairs(%s) do\n %s \nend" % [
         node.key,
         node.val,
@@ -119,16 +115,12 @@ class Generator
         body_code
       ]
 
-    when ForPairNode
-      body_code = 
-      if node.body.is_a?(Array)
-        node.body.map{ |n| generate (n) }.join("\n")
-      else
-        generate(node.body)
-      end
+    when ForIPairNode
+      body_code = generate(node.body)
+
       "for %s, %s in ipairs(%s) do\n %s \nend" % [
-        generate(node.index),
-        generate(node.val),
+        node.index,
+        node.val,
         generate(node.t),
         body_code
       ]
@@ -142,7 +134,7 @@ class Generator
           compiled << "elseif #{generate(c.match)} == #{generate(node.value)} then\n"
         end
 
-        body_code = c.body.map { |b| generate(b) }.join("\n")
+        body_code = generate(c.body)
         compiled << " #{body_code}\n"
 
       end
@@ -153,12 +145,12 @@ class Generator
     when CallNode
       "%s(%s)" % [
         node.name,
-        node.arg_expr.map { |expr| generate(expr) }.join(",")
+         generate_arguments(node.arg_expr)
       ]
 
     when PrintNode
       "print(%s)" % [
-        node.args.map { |expr| generate(expr) }.join(",")
+        generate_arguments(node.args)
       ]
 
     when VarAssignNode
@@ -169,7 +161,7 @@ class Generator
 
     when VarSetNode
       "%s = %s" % [
-        node.name,
+        node.children.join("."),
         generate(node.value)
       ]
 
@@ -185,7 +177,7 @@ class Generator
       selfstring = "self#{node.type}#{node.name}"
     
       if !node.args.empty?
-        args_string = node.args.map {|expr| generate(expr) }.join(",")
+        args_string = generate_arguments(node.args)
         selfstring += "(#{args_string})"
       else
         selfstring += " = %s" % [
@@ -198,7 +190,7 @@ class Generator
       "love.%s.%s(%s)" % [
         node.namespace,
         node.name,
-        node.args.map { |expr| generate(expr) }.join(",")
+        generate_arguments(node.args)
       ]
 
     when ReturnNode
@@ -221,146 +213,12 @@ class Generator
       ]
     
     when ArrayNode
-      elements = node.elements.map { |e| generate(e) }.join(", ")
+      elements = generate_arguments(node.elements)
       "{#{elements}}"
 
     when ArrayAccessNode
       "#{node.name}[#{generate(node.index)}]"
 
-    # when ErrorCallNode
-    #   <<~LUA
-    #   local utf8 = require("utf8")
-
-    #   local function error_printer(msg, layer)
-    #     print((debug.traceback("Error: " .. tostring(msg), 1+(layer or 1)):gsub("\n[^\n]+$", "")))
-    #   end
-
-    #   function love.errorhandler(msg)
-    #     msg = tostring(msg)
-
-    #     error_printer(msg, 2)
-
-    #     if not love.window or not love.graphics or not love.event then
-    #       return
-    #     end
-
-    #     if not love.graphics.isCreated() or not love.window.isOpen() then
-    #       local success, status = pcall(love.window.setMode, 800, 600)
-    #       if not success or not status then
-    #         return
-    #       end
-    #     end
-
-    #     -- Reset state.
-    #     if love.mouse then
-    #       love.mouse.setVisible(true)
-    #       love.mouse.setGrabbed(false)
-    #       love.mouse.setRelativeMode(false)
-    #       if love.mouse.isCursorSupported() then
-    #         love.mouse.setCursor()
-    #       end
-    #     end
-    #     if love.joystick then
-    #       -- Stop all joystick vibrations.
-    #       for i,v in ipairs(love.joystick.getJoysticks()) do
-    #         v:setVibration()
-    #       end
-    #     end
-    #     if love.audio then love.audio.stop() end
-
-    #     love.graphics.reset()
-    #     local font = love.graphics.setNewFont(14)
-
-    #     love.graphics.setColor(1, 1, 1)
-
-    #     local trace = debug.traceback()
-
-    #     love.graphics.origin()
-
-    #     local sanitizedmsg = {}
-    #     for char in msg:gmatch(utf8.charpattern) do
-    #       table.insert(sanitizedmsg, char)
-    #     end
-    #     sanitizedmsg = table.concat(sanitizedmsg)
-
-    #     local err = {}
-
-    #     table.insert(err, "Error\n")
-    #     table.insert(err, sanitizedmsg)
-
-    #     if #sanitizedmsg ~= #msg then
-    #       table.insert(err, "Invalid UTF-8 string in error message.")
-    #     end
-
-    #     table.insert(err, "\n")
-
-    #     for l in trace:gmatch("(.-)\n") do
-    #       if not l:match("boot.lua") then
-    #         l = l:gsub("stack traceback:", "Traceback\n")
-    #         table.insert(err, l)
-    #       end
-    #     end
-
-    #     local p = table.concat(err, "\n")
-
-    #     p = p:gsub("\t", "")
-    #     p = p:gsub("%[string \"(.-)\"%]", "%1")
-
-    #     local function draw()
-    #       if not love.graphics.isActive() then return end
-    #       local pos = 70
-    #       love.graphics.clear(89/255, 157/255, 220/255)
-    #       love.graphics.printf(p, pos, pos, love.graphics.getWidth() - pos)
-    #       love.graphics.present()
-    #     end
-
-    #     local fullErrorText = p
-    #     local function copyToClipboard()
-    #       if not love.system then return end
-    #       love.system.setClipboardText(fullErrorText)
-    #       p = p .. "\nCopied to clipboard!"
-    #     end
-
-    #     if love.system then
-    #       p = p .. "\n\nPress Ctrl+C or tap to copy this error"
-    #     end
-
-    #     return function()
-    #       love.event.pump()
-
-    #       for e, a, b, c in love.event.poll() do
-    #         if e == "quit" then
-    #           return 1
-    #         elseif e == "keypressed" and a == "escape" then
-    #           return 1
-    #         elseif e == "keypressed" and a == "c" and love.keyboard.isDown("lctrl", "rctrl") then
-    #           copyToClipboard()
-    #         elseif e == "touchpressed" then
-    #           local name = love.window.getTitle()
-    #           if #name == 0 or name == "Untitled" then name = "Game" end
-    #           local buttons = {"OK", "Cancel"}
-    #           if love.system then
-    #             buttons[3] = "Copy to clipboard"
-    #           end
-    #           local pressed = love.window.showMessageBox("Quit "..name.."?", "", buttons)
-    #           if pressed == 1 then
-    #             return 1
-    #           elseif pressed == 3 then
-    #             copyToClipboard()
-    #           end
-    #         end
-    #       end
-
-    #       draw()
-
-    #       if love.timer then
-    #         love.timer.sleep(0.1)
-    #       end
-    #     end
-
-    #   end
-    #   LUA
-
     else
       raise "Unknown node type: #{node.class}"
     end

data/compiler/compile.rb

@@ -3,6 +3,7 @@
 require_relative "tokenizer"
 require_relative "parser"
 require_relative "codegen"
+require_relative "errors"
 
 if ARGV.empty?
     puts "Usage: lat <input.lat> [output.lua]"
@@ -21,6 +22,22 @@ end
 
 OS = detect_os
 
+def report_syntax_error(err, filename, source)
+    location = err.line ? "#{filename}:#{err.line}" : filename
+    puts "lat: syntax error in #{location}"
+
+    if err.line && source
+        src_line = source.split("\n", -1)[err.line - 1]
+        if src_line
+            puts "      #{src_line}"
+            puts "      #{" " * (err.column - 1)}^" if err.column
+        end
+    end
+
+    puts "  #{err.message}"
+end
+
+
 def love_installed?
     if OS == :windows
         common_paths = [
@@ -120,25 +137,114 @@ if RbConfig::CONFIG["host_os"] =~ /mswin|mingw|cygwin/
   system("attrib +h #{latcDir}") # -h to unhide
 end
 
+inputDir = File.dirname(inputFile)
 basename = File.basename(inputFile, ".*")
 outputFile = File.join(latcDir, basename == "main" ? "main.lua" : "#{basename}.lua")
+confOutputFile = File.join(latcDir, "conf.lua")
+
+confPath = File.join(inputDir, "conf.lat")
+confInput = File.read(confPath) if File.exist?(confPath)
 
 input = File.read(inputFile)
+confInput = File.read(confPath) if File.exist?(confPath)
 
-tokens = Tokenizer.new(input).tokenize
+confTokens = Tokenizer.new(confInput).tokenize if confInput
 # puts "--- TOKENS ---"
 # puts tokens.map(&:inspect).join("\n")
 
-tree = Parser.new(tokens).parse
+confTree = Parser.new(confTokens).parse if confTokens
 # puts "--- AST ---"
 # p tree
 
+
+begin
+  tokens = Tokenizer.new(input).tokenize
+  tree = Parser.new(tokens).parse
+rescue LatSyntaxError => e 
+    report_syntax_error(e, inputFile, input)
+    exit 1
+end
+
+confTree = nil
+if confInput
+    begin
+        confTokens = Tokenizer.new(confInput).tokenize
+        confTree = Parser.new(confTokens).parse
+    rescue LatSyntaxError => e 
+        report_syntax_error(e, confPath, confInput)
+        exit 1
+    end
+end
+
+
+
+
 generated = Generator.new.generate(tree)
+confGenerated = Generator.new.generate(confTree) if confTree
 # puts "--- LUA OUTPUT ---"
 # puts generated
-File.open(outputFile, 'w') { |file| file.write(generated)}
 
+def build_source_map(lua_source)
+    map = {}
+    clean_lines = lua_source.split("\n", -1).each_with_index.map do |line, idx|
+        if line =~ /\A(\s*)--\[\[@(\d+)\]\](.*)\z/m
+            map[idx + 1] = $2.to_i
+            "#{$1}#{$3}"
+        else
+            line
+        end
+    end
+    [clean_lines.join("\n"), map]
+end
+
+def build_lat_shim(basename, source_map)
+  table_entries = source_map.map { |k, v| "[#{k}]=#{v}" }.join(",")
+  <<~LUA
+    local _LAT_SOURCE_MAP_T = { #{table_entries} }
+    local _LAT_FILE = "#{basename}.lat"
+
+    local function _lat_remap(text)
+      return (text:gsub("#{basename}%.lua:(%d+)", function(n)
+        local mapped = _LAT_SOURCE_MAP_T[tonumber(n)]
+        return mapped and (_LAT_FILE .. ":" .. mapped) or ("#{basename}.lua:" .. n)
+      end))
+    end
+
+    local _LAT_ERROR_BG = {0.1, 0.1, 0.15}  
+
+    if _lat_default_handler then
+      local function _lat_wrapped_handler(msg)
+        local loop = _lat_default_handler(_lat_remap(tostring(msg)))
+        if type(loop) == "function" then
+          local real_clear = love.graphics.clear
+          return function(...)
+            love.graphics.clear = function() real_clear(_LAT_ERROR_BG[1], _LAT_ERROR_BG[2], _LAT_ERROR_BG[3]) end
+            local result = loop(...)
+            love.graphics.clear = real_clear
+            return result
+          end
+        end
+        return loop
+      end
+      love.errorhandler = _lat_wrapped_handler
+      love.errhand = _lat_wrapped_handler
+    end
+
+  LUA
+end
+
+
+generated, source_map = build_source_map(generated)
+
+shim_line_count = build_lat_shim(basename, {}).each_line.count
+offset_map = source_map.each_with_object({}) { |(k, v), h| h[k + shim_line_count] = v }
+
+generated = build_lat_shim(basename, offset_map) + generated
+
+confGenerated, _conf_source_map = build_source_map(confGenerated) if confGenerated
 
+File.open(outputFile, 'w') { |file| file.write(generated) }
+File.open(confOutputFile, 'w') { |file| file.write(confGenerated) } if confGenerated
 exec(find_love(), latcDir) unless skip_run
 
 # ln -s "$(pwd)/compiler/compile.rb" /usr/local/bin/lat

data/compiler/errors.rb

@@ -0,0 +1,8 @@
+class LatSyntaxError < StandardError
+  attr_reader :line, :column
+  def initialize(message, line: nil, column: nil)
+    @line = line
+    @column = column
+    super(message)
+  end
+end

data/compiler/parser.rb

@@ -19,7 +19,7 @@ StringNode = Struct.new(:value)
 CallNode    = Struct.new(:name, :arg_expr)
 VarRefNode  = Struct.new(:value)
 VarAssignNode = Struct.new(:name, :value)
-VarSetNode = Struct.new(:name, :value)
+VarSetNode = Struct.new(:children, :value)
 BinOpNode = Struct.new(:left, :op, :right)
 PrintNode = Struct.new(:args)
 ReturnNode = Struct.new(:statement)
@@ -35,7 +35,6 @@ SelfNode = Struct.new(:name, :type, :args, :value)
 
 ErrorCallNode = Struct.new()
 
-
 LOVE_NAMESPACES = {
   lgraphics: "graphics",
   laudio: "audio",
@@ -59,9 +58,48 @@ OP_NAMESPACES = {
 
 }
 
+FRIENDLY_TOKEN_NAMES = {
+  end: "'done'",
+  def: "'call'",
+  local: "'nat'",
+  while: "'when'",
+  forpairs: "'each'",
+  foripairs: "'seq'",
+  in: "'as'",
+  import: "'bring'",
+  if: "'if'",
+  elif: "'elif'",
+  else: "'else'",
+  switch: "'switch'",
+  to: "'to'",
+  class: "'class'",
+  self: "'self'",
+  identifier: "an identifier",
+  string: "a string",
+  integer: "a number",
+  float: "a number",
+  oparen: "'('",
+  cparen: "')'",
+  lbracket: "'['",
+  rbracket: "']'",
+  lbrace: "'{'",
+  rbrace: "'}'",
+  comma: "','",
+  dot: "'.'",
+  colon: "':'",
+  equal: "'='",
+  dequal: "'=='",
+  newline: "a newline",
+}.freeze
+
 class Parser
   def initialize(tokens)
     @tokens = tokens
+    @last_line = tokens.first&.line
+  end
+
+  def describe_token_type(type)
+    FRIENDLY_TOKEN_NAMES[type] || "'#{type}'"
   end
 
   def parse
@@ -86,36 +124,41 @@ class Parser
     skip_newlines
     return nil if peek(:end)
 
-    if peek(:import) then
-      parse_import
-    elsif peek(:class) then
-      parse_class
-    elsif peek(:def)
-      parse_def
-    elsif peek(:if)
-      parse_if
-    elsif peek(:while)
-      parse_while
-    elsif peek(:for)
-      parse_for
-    elsif peek(:forpairs)
-      parse_forpairs
-    elsif peek(:foripairs)
-      parse_foripairs
-    elsif peek(:switch)
-      parse_switch
-    elsif peek(:print)
-      parse_print
-    elsif peek(:local)
-      parse_var_assign
-    elsif peek(:identifier) && peek(:equal, 1)
-      parse_var_set
-    elsif peek(:return)
-      parse_return
-    else
-      parse_expr
-    end
+    line = @tokens[0]&.line
+
+    node = 
+      if peek(:import) then
+        parse_import
+      elsif peek(:class) then
+        parse_class
+      elsif peek(:def)
+        parse_def
+      elsif peek(:if)
+        parse_if
+      elsif peek(:while)
+        parse_while
+      elsif peek(:for)
+        parse_for
+      elsif peek(:forpairs)
+        parse_forpairs
+      elsif peek(:foripairs)
+        parse_foripairs
+      elsif peek(:switch)
+        parse_switch
+      elsif peek(:print)
+        parse_print
+      elsif peek(:local)
+        parse_var_assign
+      elsif seems_var_set?
+        parse_var_set
+      elsif peek(:return)
+        parse_return
+      else
+        parse_expr
+      end
 
+    node.instance_variable_set(:@lat_line, line) if node.respond_to?(:instance_variable_set) && line
+    node
 
   end
 
@@ -123,6 +166,16 @@ class Parser
     consume(:newline) while peek(:newline)
   end
 
+  def seems_var_set?
+    return false unless peek(:identifier)
+    offset = 1
+
+    while peek(:dot, offset) && peek(:identifier, offset + 1)
+      offset += 2
+    end
+    peek(:equal, offset)
+  end
+
   def parse_import
     consume(:import)
     location = consume(:string).value
@@ -177,7 +230,6 @@ class Parser
     DefNode.new(type, name, args, body)
   end
 
-
   def parse_if
     consume(:if)
     condition = parse_expr
@@ -267,7 +319,6 @@ class Parser
     ForPairNode.new(key, val, t, body)
   end
   
-  
   def parse_foripairs
     consume(:foripairs)
     index = consume(:identifier).value
@@ -322,10 +373,14 @@ class Parser
   end
 
   def parse_var_set
-    name = consume(:identifier).value
+    children = [consume(:identifier).value] # First get the identifier
+    while peek(:dot) # Check if there is a dot or a child for it
+      consume(:dot)
+      children << consume(:identifier).value
+    end
     consume(:equal)
     value = parse_expr
-    VarSetNode.new(name, value)
+    VarSetNode.new(children, value)
   end
 
   def parse_return
@@ -371,8 +426,6 @@ class Parser
     body
   end
 
-
-
   def parse_additive
     left = parse_multiplicative
 
@@ -395,7 +448,6 @@ class Parser
     left
   end
 
-
   def parse_term
     skip_newlines
     if peek(:integer)
@@ -458,7 +510,21 @@ class Parser
     elsif LOVE_NAMESPACES.keys.include?(peek_type)
       parse_love_call
     else
-      raise "Unexpected token #{@tokens[0].inspect} in term"
+      token = @tokens[0]
+      if token.nil?
+        raise LatSyntaxError.new(
+          "Expected an expression but reached the end of the file",
+          line: @last_line
+        )
+      end
+
+      raise LatSyntaxError.new(
+        "Expected an expression but got #{describe_token_type(token.type)} (\"#{token.value}\")",
+        line: token.line,
+        column: token.column
+      
+        )
+      # raise "Unexpected token #{@tokens[0].inspect} in term"
 
     end
   end
@@ -554,8 +620,28 @@ class Parser
 
   def consume(type)
     token = @tokens.shift
-    raise "Expected #{type}, got #{token.type}" unless token.type == type
+    # raise "Expected #{type}, got #{token.type}" unless token.type == type
+    # token
+
+    if token.nil?
+      raise LatSyntaxError.new(
+        "Expected #{describe_token_type(type)} but reached the end of the file",
+        line: @last_line
+      )
+    end
+
+    unless token.type == type
+      raise LatSyntaxError.new(
+        "Expected #{describe_token_type(type)} but got #{describe_token_type(token.type)} (\"#{token.value}\")",
+        line: token.line,
+        column: token.column
+
+      )
+    end
+
+    @last_line = token.line
     token
+
   end
 
   def peek(type, offset = 0)

data/compiler/tokenizer.rb

@@ -1,4 +1,4 @@
-Token = Struct.new(:type, :value)
+Token = Struct.new(:type, :value, :line, :column)
 
 class Tokenizer
 
@@ -73,8 +73,12 @@ class Tokenizer
 
   ]
 
-  def initialize(code)
-    @code = code
+  def initialize(code, filename = nil)
+    @code = code.gsub(/\r\n?/, "\n")
+    @filename = filename
+    @line = 1
+    @column = 1
+    # puts "Tokenizer initialized with: #{code.inspect}"
   end
 
   def tokenize
@@ -89,19 +93,39 @@ class Tokenizer
   def tokenize_token
     TOKEN_TYPES.each do |type, regex|
       anchored = /\A(#{regex})/
-
-
+      
       if @code =~ anchored
         value = $1
         if type == :space
           @code = @code[value.length..-1]
+          @column += value.length
           return tokenize_token
         end
+
+        token = Token.new(type, value, @line)
         @code = @code[value.length..-1]
-        return Token.new(type, value)
+
+        if type == :newline
+          @line += value.count("\n")
+          @column = 1
+        else
+          @column += value.length
+        end
+
+        # return Token.new(type, value)
+        return token
       end
     end
 
-    raise "Couldn't match token on #{@code.inspect}"
+    snippet = @code.lines.first.to_s.chomp
+    snippet = snippet[0, 30] + "..." if snippet.length > 30
+
+    raise LatSyntaxError.new(
+      "Unrecognized syntax near #{snippet.inspect}",
+      line: @line,
+      column: @column
+    )
+
+    # raise "Couldn't match token on #{@code.inspect}"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lat
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - JakeOJeff
@@ -17,6 +17,7 @@ files:
 - bin/lat
 - compiler/codegen.rb
 - compiler/compile.rb
+- compiler/errors.rb
 - compiler/parser.rb
 - compiler/tokenizer.rb
 homepage: https://github.com/JakeOJeff/lat