lat 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 051514055bc30ad3baf609b932c2b252f842ca9d864f929a6f8115ad72847de7
-  data.tar.gz: 6352e1091aab7ba991cec765bd77941eba6d92ff998684b2958fd92ccce1e17a
+  metadata.gz: 79c0178cf5e3b3e1168af97aec3a318b082b25c43a2835464682f6bdcdf545f7
+  data.tar.gz: ef5b003a8c15b86ffd3575844232bfe909b084844587a114312b35d5d76e113b
 SHA512:
-  metadata.gz: d5c337be6a2c2d6525638fbcc0c3e57b2fcacc021501af218c2e5a452a4fb526356df6c5a5210cef99262f91f7c26c1d6cffdb0857caccc29f875547e15c5fa2
-  data.tar.gz: adbc284ef685eb4ceac54abe6dfe7a4337e29ea99f5784050ac28a47aff13194c6f61a4a26089231ed100f2a4fcc49839a1fcc39b5b4efbc6b257c365aeed51f
+  metadata.gz: a8377175fe6c7cb97521c4a51c6a7a5b2ebe0aa1a9bb9c3a0f19299fdd2e7d9f08fc9c5efe86098b716063ea656293d4612fc5575cfb39481d81fadd2282210b
+  data.tar.gz: 50e003a2f76a40427759f032ce0da3355422c481d6089f99d2deb1f1d384ca137478ffc0b14dd64c74ab3c856edc09c19ac99dc8b3665214d608e6b847ab39b7

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

@@ -7,9 +7,8 @@ class Generator
     case node
     
     when ImportNode
-      "require %s" % [
-        node.location
-      ]
+        "require(\"#{node.location}\")"
+        
     when ClassNode
       out = []
       out << "local #{node.name} = {}"
@@ -90,6 +89,50 @@ class Generator
         body_code
       ]
 
+    when ForNode
+      body_code = 
+      if node.body.is_a?(Array)
+        node.body.map{ |n| generate (n) }.join("\n")
+      else
+        generate(node.body)
+      end
+      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 = 
+      if node.body.is_a?(Array)
+        node.body.map{ |n| generate (n) }.join("\n")
+      else
+        generate(node.body)
+      end
+      "for %s, %s in pairs(%s) do\n %s \nend" % [
+        node.key,
+        node.val,
+        generate(node.t),
+        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
+      "for %s, %s in ipairs(%s) do\n %s \nend" % [
+        generate(node.index),
+        generate(node.val),
+        generate(node.t),
+        body_code
+      ]
+
     when SwitchNode
       compiled = ""
       node.cases.each_with_index do |c, i|
@@ -169,6 +212,9 @@ class Generator
     when IntegerNode
       node.value.to_s
 
+    when FloatNode
+      node.value.to_s
+
     when StringNode
       "\"%s\"" % [
         node.value

data/compiler/compile.rb

@@ -19,8 +19,10 @@ def detect_os
     :linux
 end
 
+OS = detect_os
+
 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 +35,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 +53,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 +75,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 +100,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 +109,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
 
@@ -139,6 +138,7 @@ generated = Generator.new.generate(tree)
 # puts generated
 File.open(outputFile, 'w') { |file| file.write(generated)}
 
-exec(love, latcDir) unless skip_run
+
+exec(find_love(), latcDir) unless skip_run
 
 # ln -s "$(pwd)/compiler/compile.rb" /usr/local/bin/lat

data/compiler/parser.rb

@@ -6,9 +6,16 @@ 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)
@@ -89,6 +96,12 @@ class Parser
       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)
@@ -142,14 +155,8 @@ class Parser
     consume(:def)
     name = "#{name}:#{consume(:identifier).value}"
     args = parse_args
-    skip_newlines
-
-    body = []
+    body = parse_block
 
-    until peek(:end)
-      body << parse_statement
-      skip_newlines
-    end
     consume(:end)
     ClassDefNode.new(name, args, body)
   end
@@ -165,13 +172,7 @@ 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
@@ -207,11 +208,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 +228,57 @@ 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
@@ -306,24 +345,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,6 +360,17 @@ class Parser
     args
   end
 
+  def parse_block
+    skip_newlines
+    body = []
+
+    until peek(:end)
+      body << parse_statement
+      skip_newlines
+    end
+    body
+  end
+
 
 
   def parse_additive
@@ -362,41 +394,31 @@ 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 +429,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,8 +452,7 @@ class Parser
     elsif peek(:self)
       parse_self_node
 
-    elsif peek(:coparen)
-      parse_array
+
 
 
     elsif LOVE_NAMESPACES.keys.include?(peek_type)
@@ -444,7 +469,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,25 +525,30 @@ 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
 
@@ -534,4 +565,4 @@ class Parser
   def peek_type(offset = 0)
     @tokens[offset]&.type
   end
-end
+end

data/compiler/tokenizer.rb

@@ -3,56 +3,66 @@ Token = Struct.new(:type, :value)
 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, /\*/],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - JakeOJeff