lat 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 051514055bc30ad3baf609b932c2b252f842ca9d864f929a6f8115ad72847de7
-  data.tar.gz: 6352e1091aab7ba991cec765bd77941eba6d92ff998684b2958fd92ccce1e17a
+  metadata.gz: c2053d16f88f07ebebeb98b8132ae6bf6adfaecb06d1573be7c0639b73755837
+  data.tar.gz: 02063ec4e1819c2743e426bdbc4b642f4e0862b1ce4cdfd4b02e2aba69abc380
 SHA512:
-  metadata.gz: d5c337be6a2c2d6525638fbcc0c3e57b2fcacc021501af218c2e5a452a4fb526356df6c5a5210cef99262f91f7c26c1d6cffdb0857caccc29f875547e15c5fa2
-  data.tar.gz: adbc284ef685eb4ceac54abe6dfe7a4337e29ea99f5784050ac28a47aff13194c6f61a4a26089231ed100f2a4fcc49839a1fcc39b5b4efbc6b257c365aeed51f
+  metadata.gz: d080afc37148a4c9cab7daf30cdada85ab226f11a0bc13a7786ba3aa840156fc5b622ab5474dec0e7879926fa0952a09024a463afb93800b11facd0b15336a6c
+  data.tar.gz: 6674298934d89ce7f1f9c1e108e114a64d96330bb7d7e06ce27becd8e8e0f2b89cf2a71a5a0d963427c202ee2586a1cf5b13d824ef4f021168da04b6681f039e

data/compiler/codegen.rb

@@ -1,15 +1,29 @@
 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
     
     when ImportNode
-      "require %s" % [
-        node.location
-      ]
+        "require(\"#{node.location}\")"
+        
     when ClassNode
       out = []
       out << "local #{node.name} = {}"
@@ -40,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
       ]
 
@@ -62,34 +71,60 @@ 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),
         body_code
       ]
 
+    when ForNode
+      body_code = generate(node.body)
+
+      increment = ", #{node.step.nil? ? "" : generate(node.step)}"
+      "for %s = %s, %s%s do\n %s \nend"  % [
+        generate(node.var),
+        generate(node.start),
+        generate(node.stop),
+        increment,
+        body_code
+      ]
+
+    when ForPairNode
+      body_code = generate(node.body)
+      "for %s, %s in pairs(%s) do\n %s \nend" % [
+        node.key,
+        node.val,
+        generate(node.t),
+        body_code
+      ]
+
+    when ForIPairNode
+      body_code = generate(node.body)
+
+      "for %s, %s in ipairs(%s) do\n %s \nend" % [
+        node.index,
+        node.val,
+        generate(node.t),
+        body_code
+      ]
+
     when SwitchNode
       compiled = ""
       node.cases.each_with_index do |c, i|
@@ -99,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
@@ -110,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
@@ -126,7 +161,7 @@ class Generator
 
     when VarSetNode
       "%s = %s" % [
-        node.name,
+        node.children.join("."),
         generate(node.value)
       ]
 
@@ -142,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" % [
@@ -155,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
@@ -169,152 +204,21 @@ class Generator
     when IntegerNode
       node.value.to_s
 
+    when FloatNode
+      node.value.to_s
+
     when StringNode
       "\"%s\"" % [
         node.value
       ]
     
     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]"
@@ -19,8 +20,26 @@ def detect_os
     :linux
 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 detect_os == :windows
+    if OS == :windows
         common_paths = [
             "C:/Program Files/LOVE/love.exe",
             "C:/Program Files (x86)/LOVE/love.exe",
@@ -33,15 +52,14 @@ def love_installed?
 end
 
 def install_love
-    os = detect_os
     puts "[lat] Love2D not found, attempting to install"
-    print "Do you want to install Love2d? (y/n)"
+    print "Do you want to install LOVE2D? (y/n)"
     answer = $stdin.gets.chomp.downcase
 
     if %w[y yes].include?(answer.downcase)
         puts "installing love..."
 
-        case os
+        case OS
         when :arch
             system("sudo pacman -S --noconfirm love")
         when :debian
@@ -52,11 +70,11 @@ def install_love
             if system("which brew > /dev/null 2>&1")
                 system("brew install love")
             else
-                puts "[lat] Homebrew not found. Install Love2D from https://love2d.org"
+                puts "[lat] Homebrew not found. Install LOVE2D from https://love2d.org"
                 exit 1
             end
         when :windows
-            puts "[lat] Please install Love2D from https://love2d.org"
+            puts "[lat] Please install LOVE2D from https://love2d.org"
             puts "[lat] Set LOVE_PATH to the love.exe location:"
             puts '[lat]   setx LOVE_PATH "C:\\Program Files\\LOVE\\love.exe"'
         else
@@ -74,22 +92,19 @@ end
 def find_love
     install_love unless love_installed?
 
-    candidates = [
-        "love",
-        "C:/Program Files/LOVE/love.exe",
-        "C:/Program Files (x86)/LOVE/love.exe",
-        ENV["LOVE_PATH"]
-    ].compact
-
-    candidates.each do |path|
-        return path if system("where #{path} >nul 2>&1") || File.exist?(path.to_s)
+    if OS == :windows
+        candidates = [ENV["LOVE_PATH"], "C:/Program Files/LOVE/love.exe", "C:/Program Files (x86)/LOVE/love.exe"].compact
+        candidates.each { |p| return p if File.exist?(p) }
+    else
+        ["love", "love2d"].each do |cmd|
+            return cmd if system("which #{cmd} > /dev/null 2>&1")
+        end
     end
 
     puts "Error: LOVE2D not found. Install it from https://love2d.org or set LOVE_PATH env variable."
     exit 1
 end
 skip_run = false
-love = find_love()
 
 if ARGV[0] == "run"
     latcDir = File.join(Dir.pwd, ".latc")
@@ -102,6 +117,7 @@ if ARGV[0] == "run"
         puts "Error: .latc exists but no main.lua found"
         exit 1
     end
+    love = find_love()
     exec(love, latcDir)
 elsif ARGV[0] == "build"
     ARGV.shift
@@ -110,7 +126,7 @@ end
 inputFile  = ARGV[0] || "main.lat"
 
 unless File.exist?(inputFile)
-    puts "Error: fil `#{inputFile}` not found"
+    puts "Error: file `#{inputFile}` not found"
     exit 1
 end
 
@@ -121,24 +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)}
 
-exec(love, latcDir) unless skip_run
+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

@@ -6,13 +6,20 @@ IfNode = Struct.new(:condition, :body, :elif_blocks, :else_body)
 ElifBlock = Struct.new(:condition, :body)
 
 ImportNode = Struct.new(:location)
+
 WhileNode = Struct.new(:statement, :body)
+ForNode = Struct.new(:var, :start, :stop, :step, :body)
+ForPairNode = Struct.new(:key, :val, :t, :body)
+ForIPairNode = Struct.new(:index, :val, :t, :body)
+
 IntegerNode = Struct.new(:value)
+FloatNode = Struct.new(:value)
 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)
@@ -28,7 +35,6 @@ SelfNode = Struct.new(:name, :type, :args, :value)
 
 ErrorCallNode = Struct.new()
 
-
 LOVE_NAMESPACES = {
   lgraphics: "graphics",
   laudio: "audio",
@@ -52,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
@@ -79,30 +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(: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
 
@@ -110,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
@@ -142,14 +208,8 @@ class Parser
     consume(:def)
     name = "#{name}:#{consume(:identifier).value}"
     args = parse_args
-    skip_newlines
+    body = parse_block
 
-    body = []
-
-    until peek(:end)
-      body << parse_statement
-      skip_newlines
-    end
     consume(:end)
     ClassDefNode.new(name, args, body)
   end
@@ -165,18 +225,11 @@ class Parser
     name = consume(:identifier).value
     args = parse_args
 
-    skip_newlines
-    body = []
-
-    until peek(:end)
-      body << parse_statement
-      skip_newlines
-    end
+    body = parse_block
     consume(:end)
     DefNode.new(type, name, args, body)
   end
 
-
   def parse_if
     consume(:if)
     condition = parse_expr
@@ -207,11 +260,8 @@ class Parser
       consume(:else)
       skip_newlines
 
-      else_body = []
-      while !peek(:end)
-        else_body << parse_statement
-        skip_newlines
-      end
+      else_body = parse_block
+
     end
 
     consume(:end)
@@ -230,16 +280,56 @@ class Parser
       statement = parse_expr
     end
 
-    skip_newlines
-    body = []
+    body = parse_block
 
-    until peek(:end)
-      body << parse_statement
-      skip_newlines
+    consume(:end)
+    WhileNode.new(statement, body)
+  end
+
+  def parse_for
+    consume(:for)
+    var = parse_expr
+    consume(:equal)
+    start = parse_expr
+    consume(:comma)
+    stop = parse_expr
+
+    step = nil
+    if peek(:comma) 
+      consume(:comma)
+      step = parse_expr
     end
+    body = parse_block
 
     consume(:end)
-    WhileNode.new(statement, body)
+    ForNode.new(var, start, stop, step, body)
+
+  end
+
+  def parse_forpairs
+    consume(:forpairs)
+    key = consume(:identifier).value
+    consume(:comma)
+    val = consume(:identifier).value
+    consume(:in)
+    t = parse_expr
+    body = parse_block
+    consume(:end)
+
+    ForPairNode.new(key, val, t, body)
+  end
+  
+  def parse_foripairs
+    consume(:foripairs)
+    index = consume(:identifier).value
+    consume(:comma)
+    val = consume(:identifier).value
+    consume(:in)
+    t = parse_expr
+    body = parse_block
+    consume(:end)
+
+    ForIPairNode.new(index, val, t, body)
   end
 
   def parse_switch
@@ -283,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
@@ -306,24 +400,6 @@ class Parser
 
     left
   end
-    # consume(:if)
-
-    # if peek(:oparen)
-    #   consume(:oparen)
-    #   statement = parse_expr
-    #   consume(:cparen)
-    # else
-    #   statement = parse_expr
-    # end
-    # skip_newlines
-    # body = []
-
-    # until peek(:elif) peek(:end)
-    #   body << parse_statement
-    #   skip_newlines
-    # end
-    # consume(:end)
-    # IfNode.new(statement, body)
 
   def parse_args
     consume(:oparen)
@@ -339,7 +415,16 @@ class Parser
     args
   end
 
+  def parse_block
+    skip_newlines
+    body = []
 
+    until peek(:end)
+      body << parse_statement
+      skip_newlines
+    end
+    body
+  end
 
   def parse_additive
     left = parse_multiplicative
@@ -362,41 +447,30 @@ class Parser
     end
     left
   end
-  # def parse_operators
-  #   left = parse_term
-
-  #   left = parse_op(left, :divide)
-  #   left = parse_op(left, :multiply)
-  #   left = parse_op(left, :plus)
-  #   left = parse_op(left, :minus)
-
-  #   left
-  # end
-
-  # def parse_op(left, operator)
-
-  #   while peek(operator)
-  #     consume(operator)
-  #     right = parse_term
-  #     left = BinOpNode.new(left, operator, right)
-  #   end
-  #   left
-  
-  # end
 
   def parse_term
+    skip_newlines
     if peek(:integer)
       IntegerNode.new(consume(:integer).value.to_i)
 
+    elsif peek(:float)  
+      FloatNode.new(consume(:float).value.to_f)
+
     elsif peek(:identifier) && peek(:oparen, 1)
       parse_call
 
+    elsif peek(:identifier) && peek(:lbracket, 1)
+      parse_array_access
+
+    elsif peek(:lbrace)
+      parse_array
+
     elsif peek(:identifier)
       VarRefNode.new(consume(:identifier).value)
 
     elsif peek(:string)
       strVal = consume(:string).value
-      StringNode.new(strVal[1..-2])
+      StringNode.new(strVal[1..-2]) 
 
     elsif peek(:oparen)
       # consume(:oparen)
@@ -407,15 +481,19 @@ class Parser
 
       first = parse_expr
       items = [first]
-      until peek(:identifier) && peek(:or) && peek(:dequal) && peek(:cparen) && peek(:plus)
+      until peek(:identifier) || peek(:dequal)
         break
       end
 
-      if !peek(:identifier) && peek(:or)
+      if !peek(:identifier) && peek(:or) || peek(:and)
         while peek(:or)
           consume(:or)
           items << parse_expr
         end
+        while peek(:and)
+          consume(:and)
+          items << parse_expr
+        end
         consume(:cparen)
         return AndOrListNode.new(items)
       end
@@ -426,14 +504,27 @@ class Parser
     elsif peek(:self)
       parse_self_node
 
-    elsif peek(:coparen)
-      parse_array
+
 
 
     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
@@ -444,7 +535,8 @@ class Parser
     prefix = @tokens.shift.type
     namespace = LOVE_NAMESPACES[prefix]
 
-    name = consume(:identifier).value
+    name = @tokens.shift.value
+    
     args = parse_arg_expr
 
     LoveCallNode.new(namespace, name, args)
@@ -499,32 +591,57 @@ class Parser
   end
 
   def parse_array
-    consume(:coparen)
+    consume(:lbrace)
+    skip_newlines
     elements = []
-    unless peek(:ccparen)
+    unless peek(:rbrace)
       elements << parse_expr
+      skip_newlines
       while peek(:comma)
         consume(:comma)
+        skip_newlines
         elements << parse_expr
+        skip_newlines
       end
     end
-    consume(:ccparen)
+    skip_newlines
+    consume(:rbrace)
     ArrayNode.new(elements)
   end
 
   
   def parse_array_access
     name = consume(:identifier).value
-    consume(:soparen)
+    consume(:lbracket)
     index = parse_expr
-    consume(:scparen)
+    consume(:rbracket)
     ArrayAccessNode.new(name, index)
   end
 
   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)
@@ -534,4 +651,4 @@ class Parser
   def peek_type(offset = 0)
     @tokens[offset]&.type
   end
-end
+end

data/compiler/tokenizer.rb

@@ -1,58 +1,68 @@
-Token = Struct.new(:type, :value)
+Token = Struct.new(:type, :value, :line, :column)
 
 class Tokenizer
 
   TOKEN_TYPES = [
+
+      #love 
+    [:lgraphics, /-G:/],
+    [:laudio, /-A:/],
+    [:ldata, /-D:/],
+    [:levent, /-E:/],
+    [:lfilesystem, /-FS:/],
+    [:lfont, /-F:/],
+    [:limage, /-I:/],
+    [:ljoystick, /-J:/],
+    [:lmouse, /-M:/],
+    [:lkeyboard, /-K:/],
+    [:love, /\blove\b/],
+    
     [:local, /\bnat\b/],
     [:def, /\bcall\b/],
     [:end, /\bdone\b/],
     [:if, /\bif\b/],
     [:elif, /\belif\b/],
     [:else, /\belse\b/],
+
     [:while, /\bwhen\b/],
+    [:for, /\bfor\b/],
+    [:forpairs, /\beach\b/],
+    [:foripairs, /\bseq\b/],
+
     [:print, /\bprint\b/],
     [:return, /\breturn\b/],
     [:or, /\bor\b/],
     [:and, /\band\b/],
+    [:in, /\bas\b/],
     [:switch, /\bswitch\b/],
     [:to, /\bto\b/],
     [:class, /\bclass\b/],
     [:self, /\bself\b/],
     [:import, /\bbring\b/],
 
-    #love 
-    [:lgraphics, /-G:/],
-    [:laudio, /-A:/],
-    [:ldata, /-D:/],
-    [:levent, /-E:/],
-    [:lfilesystem, /-FS:/],
-    [:lfont, /-F:/],
-    [:limage, /-I:/],
-    [:ljoystick, /-J:/],
-    [:lmouse, /-M:/],
-    [:lkeyboard, /-K:/],
-    [:love, /\blove\b/],
+
 
     # thingies
-    [:identifier, /\b[a-zA-Z]+\b/],
+    [:identifier, /\b[a-zA-Z_][a-zA-Z0-9_]*\b/],
     [:string, /"([^"]*)"/],
-    [:integer, /\b[0-9]+\b/],
+    [:float, /(?:\d+\.\d*|\.\d+)/],
+    [:integer, /\b\d+\b/],
     [:oparen, /\(/],
     [:cparen, /\)/],
-    [:soparen, /\[/],
-    [:scparen, /\]/],
-    [:coparen, /\{/],
-    [:ccparen, /\}/],
+    [:lbracket, /\[/],
+    [:rbracket, /\]/],
+    [:lbrace, /\{/],
+    [:rbrace, /\}/],
     [:comma, /,/],
     [:dot, /\./],
     [:colon, /:/],
 
     # operators
     [:dequal, /==/],
-    [:greater, />/],
-    [:lesser, /</],
     [:grequal, />=/],
     [:lequal, /<=/],
+    [:greater, />/],
+    [:lesser, /</],
     [:equal, /=/],
     [:divide, /\//],
     [:multiply, /\*/],
@@ -63,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
@@ -79,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.1
+  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