sardonyx 0.1.8 → 0.1.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92d4b64ff337b649c89dd0ec78dded37c71f508dfd3e9705127ee8d186fae2a4
-  data.tar.gz: e087de5f23ad9c9fc9ff85e0c7ffcfaaa3cdbaf19cffecaf589cb2926c1f2dc7
+  metadata.gz: 8c24e6115400ff31393984b7220c4226ea6f6a4fc8f9ba146f8d9f3ce51f749b
+  data.tar.gz: e1b92b4d17872047f11fe869d988370898dbebc74f5fe2ba4cb5e8d0ede648ec
 SHA512:
-  metadata.gz: bc7fd1b23d60b16e2a9070fc172ce67fcf64fd1c033418e8d7693348a573635d264d94b8d0ed7809fa38f98546e8b98a9efd9d8e9ccda710de790855366f120c
-  data.tar.gz: b61e5f8f7d035638fb14f1d15e017260263b50daeb48835e774f9399e15f8ce016b00b462c1c54681d061a1378bb47549a93cd88d658def4e45b8f1c3ed01c90
+  metadata.gz: c87037ad33284bec4da7576040d214a45978ab5e018c5ef62152a2ae31858484df6f5f2e7899d6b29f9618a875d145f45960aa8c1efa22b97e60ff661b579eea
+  data.tar.gz: 2ed22a60d030ac9236075a3f97d992956753dc9c3cda125783f3e05f5c74c9d20ce3fe84a848b96b7933b2063efc9d1dd9a899f95d26957050dd7979de75d957

data/bin/sdx

@@ -29,7 +29,7 @@ else
         val = vm.stack[-1]
         vm.clear
         if val
-            puts stringify val
+            puts vm.stringify val
         end
     end
 end

data/lib/sdx/compiler/compiler.rb

@@ -72,6 +72,18 @@ module Compiler
                     bc += "\x27"
                 when "^"
                     bc += "\x28"
+                when "=="
+                    bc += "\x34"
+                when "!="
+                    bc += "\x35"
+                when "<"
+                    bc += "\x36"
+                when ">"
+                    bc += "\x37"
+                when "<="
+                    bc += "\x38"
+                when ">="
+                    bc += "\x39"
                 end
             when :if
                 bc += self.encode_node node.value
@@ -91,10 +103,12 @@ module Compiler
                     end
                     i += "\x2a#{e.size}\x18"
                 end
-                bc += "\x29#{i.size}\x18" + i
+                bc += "\x2b#{i.size}\x18" + i
                 if e
                     bc += e
                 end
+            when :bool
+                bc += "\x21\x12#{node.value}\x18"
             when :name
                 bc += "\x20#{node.value}\x18"
             when :nil

data/lib/sdx/compiler/parser.rb

@@ -10,11 +10,13 @@ module Parser
             /\Aobject/ => :object,
             /\Anew/ => :new,
             /\Arequire/ => :require,
-            /\A(<|>|<=|>=|==)/ => :op,
-            /\A(\+|-|\*|\/|%)?=/ => :eq,
-            /\A(\+|-|\*|\/|%)/ => :op,
-            /\A-?[0-9]+/ => :number,
+            /\A(true|false)/ => :bool,
             /\A-?[0-9]+\.[0-9]+/ => :float,
+            /\A-?[0-9]+/ => :number,
+            /\A(\+|-)/ => :l1op,
+            /\A(\/|\*|%)/ => :l2op,
+            /\A(<|>|<=|>=|==|!=)/ => :l1op,
+            /\A(\+|-|\*|\/|%)?=/ => :eq,
             /\A"([^"]|\\")*"/ => :string,
             /\Anil/ => :nil,
             /\A\(/ => :lpar,
@@ -97,6 +99,14 @@ module Parser
             end
         end
 
+        def self.parse_bool(tokens)
+            if self.expect tokens, :bool
+                [ (Node.new :bool, tokens[0][0], []), 1 ]
+            else
+                nil
+            end
+        end
+
         def self.parse_float(tokens)
             if self.expect tokens, :float
                 [ (Node.new :float, tokens[0][0], []), 1 ]
@@ -113,6 +123,23 @@ module Parser
             end
         end
 
+        def self.parse_parens(tokens)
+            if self.expect tokens, :lpar
+                tokens = tokens[1..tokens.size]
+                unless self.parse_expr tokens
+                    return nil
+                end
+                e, part = self.parse_expr tokens
+                tokens = tokens[part..tokens.size]
+                unless self.expect tokens, :rpar
+                    return nil
+                end
+                return [e, part + 2]
+            else
+                return nil
+            end
+        end
+
         def self.parse_list(tokens)
             unless (self.expect tokens, :lbrack)
                 return nil
@@ -155,7 +182,7 @@ module Parser
             while true
                 if self.expect tokens, :rbrace
                     total += 1
-                    break
+                    return [ (Node.new :block, "", children), total ]
                 end
                 e = self.parse_expr tokens
                 if e
@@ -167,23 +194,26 @@ module Parser
                     Kernel.exit 1
                 end
             end
+            total += 1
             [ (Node.new :block, "", children), total ]
         end
 
         def self.parse_literal(tokens)
-            (self.parse_block tokens) ||  self.parse_float(tokens) || (self.parse_name tokens) || (self.parse_number tokens) || (self.parse_list tokens) || (self.parse_string tokens) || (self.parse_nil tokens)
+            (self.parse_block tokens) || (self.parse_bool tokens) || (self.parse_float tokens) || (self.parse_name tokens) || (self.parse_number tokens) || (self.parse_list tokens) || (self.parse_string tokens) || (self.parse_nil tokens) || (self.parse_parens tokens)
         end
 
         def self.parse_call(tokens)
-            if self.lookahead tokens, :lpar, 1
-                unless (self.parse_literal tokens)
-                    return nil
-                end
-                callee = (self.parse_literal tokens)
-                callee = callee[0]
+            unless (self.parse_literal tokens)
+                return nil
+            end
+            callee = (self.parse_literal tokens)
+            total = callee[1]
+            tokens = tokens[total..tokens.size]
+            callee = callee[0]
+            if self.expect tokens, :lpar
                 args = []
-                tokens = tokens[2..tokens.size]
-                total = 2
+                tokens = tokens[1..tokens.size]
+                total += 1
                 if self.expect tokens, :rpar
                     return [ (Node.new :call, callee, args), total + 1 ]
                 end
@@ -330,7 +360,7 @@ module Parser
             return [ (Node.new :for, e, [name, block]), total ]
         end
 
-        def self.parse_op(tokens)
+        def self.parse_term(tokens)
             total = 0
             unless self.parse_literal tokens
                 return nil
@@ -338,16 +368,38 @@ module Parser
             lhs, part = self.parse_literal tokens
             total += part
             tokens = tokens[part..tokens.size]
-            unless self.expect tokens, :op
+            unless self.expect tokens, :l2op
+                return [lhs, part]
+            end
+            op = tokens[0][0]
+            total += 1
+            tokens = tokens[1..tokens.size]
+            unless self.parse_literal tokens
+                return nil
+            end
+            rhs, part = self.parse_literal tokens
+            total += part
+            return [ (Node.new :op, op, [lhs, rhs]), total]
+        end
+
+        def self.parse_op(tokens)
+            total = 0
+            unless self.parse_term tokens
                 return nil
             end
+            lhs, part = self.parse_term tokens
+            total += part
+            tokens = tokens[part..tokens.size]
+            unless self.expect tokens, :l1op
+                return [lhs, part]
+            end
             op = tokens[0][0]
             total += 1
             tokens = tokens[1..tokens.size]
-            unless self.parse_expr tokens
+            unless self.parse_term tokens
                 return nil
             end
-            rhs, part = self.parse_expr tokens
+            rhs, part = self.parse_term tokens
             total += part
             return [ (Node.new :op, op, [lhs, rhs]), total]
         end
@@ -483,7 +535,7 @@ module Parser
         end
             
         def self.parse_expr(tokens)
-            (self.parse_require tokens) || (self.parse_new tokens) || (self.parse_object tokens) || (self.parse_fn tokens) || (self.parse_assign tokens) || (self.parse_op tokens)  || (self.parse_call tokens) || (self.parse_literal tokens) || (self.parse_if tokens) || (self.parse_while tokens) || (self.parse_for tokens)
+            (self.parse_require tokens) || (self.parse_new tokens) || (self.parse_object tokens) || (self.parse_fn tokens) || (self.parse_assign tokens) || (self.parse_op tokens)  || (self.parse_term tokens) || (self.parse_call tokens) || (self.parse_literal tokens) || (self.parse_if tokens) || (self.parse_while tokens) || (self.parse_for tokens)
         end
 
         def self.parse(tokens, path)

data/lib/sdx/vm/datatypes.rb

@@ -58,6 +58,12 @@ class Bool < DataType
             end)),
             "__as_code_string" => (NativeFn.new 0, (Proc.new do
                 as_string
+            end)),
+            "__eq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal == other[0].internal
+            end)),
+            "__neq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal != other[0].internal
             end))
         }
     end
@@ -83,22 +89,40 @@ class Int < DataType
                 as_bool
             end)),
             "__add" => (NativeFnInternal.new (Proc.new do |other|
-                add other
+                add other[0]
             end)),
             "__sub" => (NativeFnInternal.new (Proc.new do |other|
-                sub other
+                sub other[0]
             end)),
             "__mul" => (NativeFnInternal.new (Proc.new do |other|
-                mul other
+                mul other[0]
             end)),
             "__div" => (NativeFnInternal.new (Proc.new do |other|
-                div other
+                div other[0]
             end)),
             "__mod" => (NativeFnInternal.new (Proc.new do |other|
-                mod other
+                mod other[0]
             end)),
             "__pow" => (NativeFnInternal.new (Proc.new do |other|
-                pow other
+                pow other[0]
+            end)),
+            "__lt" => (NativeFnInternal.new (Proc.new do |other|
+                lt other[0]
+            end)),
+            "__gt" => (NativeFnInternal.new (Proc.new do |other|
+                gt other[0]
+            end)),
+            "__le" => (NativeFnInternal.new (Proc.new do |other|
+                le other[0]
+            end)),
+            "__ge" => (NativeFnInternal.new (Proc.new do |other|
+                ge other[0]
+            end)),
+            "__eq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal == other[0].internal
+            end)),
+            "__neq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal != other[0].internal
             end))
         }
     end
@@ -134,6 +158,22 @@ class Int < DataType
     def pow(other)
         Int.new @internal ** other.internal
     end
+
+    def lt(other)
+        Bool.new @internal < other.internal
+    end
+
+    def gt(other)
+        Bool.new @internal > other.internal
+    end
+
+    def le(other)
+        Bool.new @internal <= other.internal
+    end
+
+    def ge(other)
+        Bool.new @internal >= other.internal
+    end
 end
 
 class Str < DataType 
@@ -149,10 +189,16 @@ class Str < DataType
                 as_code_string
             end)),
             "__add" => (NativeFnInternal.new (Proc.new do |other|
-                add other
+                add other[0]
             end)),
             "__mul" => (NativeFnInternal.new (Proc.new do |other|
-                mul other
+                mul other[0]
+            end)),
+            "__eq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal == other[0].internal
+            end)),
+            "__neq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal != other[0].internal
             end))
         }
     end
@@ -162,7 +208,7 @@ class Str < DataType
     end
 
     def as_code_string
-        (Str.new "\"#{@internal}\"")
+        (Str.new @internal.dump)
     end
 
     def add(other)
@@ -190,22 +236,40 @@ class Num < DataType
                 as_bool
             end)),
             "__add" => (NativeFnInternal.new (Proc.new do |other|
-                add other
+                add other[0]
             end)),
             "__sub" => (NativeFnInternal.new (Proc.new do |other|
-                sub other
+                sub other[0]
             end)),
             "__mul" => (NativeFnInternal.new (Proc.new do |other|
-                mul other
+                mul other[0]
             end)),
             "__div" => (NativeFnInternal.new (Proc.new do |other|
-                div other
+                div other[0]
             end)),
             "__mod" => (NativeFnInternal.new (Proc.new do |other|
-                mod other
+                mod other[0]
             end)),
             "__pow" => (NativeFnInternal.new (Proc.new do |other|
-                pow other
+                pow other[0]
+            end)),
+            "__lt" => (NativeFnInternal.new (Proc.new do |other|
+                lt other[0]
+            end)),
+            "__gt" => (NativeFnInternal.new (Proc.new do |other|
+                gt other[0]
+            end)),
+            "__le" => (NativeFnInternal.new (Proc.new do |other|
+                le other[0]
+            end)),
+            "__ge" => (NativeFnInternal.new (Proc.new do |other|
+                ge other[0]
+            end)),
+            "__eq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal == other[0].internal
+            end)),
+            "__neq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal != other[0].internal
             end))
         }
     end
@@ -241,6 +305,22 @@ class Num < DataType
     def pow(other)
         Num.new @internal ** other.internal
     end
+
+    def lt(other)
+        Bool.new @internal < other.internal
+    end
+
+    def gt(other)
+        Bool.new @internal > other.internal
+    end
+
+    def le(other)
+        Bool.new @internal <= other.internal
+    end
+
+    def ge(other)
+        Bool.new @internal >= other.internal
+    end
 end
 
 class Nil < DataType
@@ -249,14 +329,21 @@ class Nil < DataType
         @fields = {
             "__as_bool" => (NativeFnInternal.new (Proc.new do
                 Bool.new false
+            end)),
+            "__eq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal == other[0].internal
+            end)),
+            "__neq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal != other[0].internal
             end))
         }
     end
 end
 
 class List < DataType
-    def initialize(val)
+    def initialize(val, scope=nil)
         @internal = val
+        @scope = scope
         @pos = 0
         @fields = {
             "__as_string" => (NativeFnInternal.new (Proc.new do 
@@ -272,34 +359,40 @@ class List < DataType
                 iter
             end)),
             "__add" => (NativeFnInternal.new (Proc.new do |other|
-                add other
+                add other[0]
             end)),
             "__mul" => (NativeFnInternal.new (Proc.new do |other|
-                mul other
+                mul other[0]
             end)),
             "__arity" => (Int.new 1),
             "__call" => (NativeFnInternal.new (Proc.new do |args, scope|
                 @internal[args[0].value.internal]
+            end)),
+            "__eq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal == other[0].internal
+            end)),
+            "__neq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal != other[0].internal
             end))
         }
     end
 
     def as_string
-        s = "["
+        s = ""
         @internal.each do |item|
             s += (stringify item) + ", "
         end
-        s = s[0..-3]
+        s = "[" + s[0..-3]
         s += "]"
         Str.new s
     end
 
     def as_code_string
-        s = "["
+        s = ""
         @internal.each do |item|
             s += (codify item) + ", "
         end
-        s = s[0..-3]
+        s = "[" + s[0..-3]
         s += "]"
         Str.new s
     end
@@ -314,12 +407,12 @@ class List < DataType
         if val
             return val
         else
-            return Variable.new Nil.new
+            return Variable.new Nil.new, :nil, @internal[0].scope
         end
     end
     
     def add(other)
-        return List.new [*@internal, other]
+        return List.new [*@internal, (Variable.new other, (get_type other), @scope || @internal[0].scope)]
     end
 
     def mul(other)
@@ -361,7 +454,13 @@ class Function < DataType
             "__call" => (NativeFnInternal.new (lambda do |args, scope|
                 call args, scope
             end)),
-            "__arity" => (Int.new args.size)
+            "__arity" => (Int.new args.size),
+            "__eq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal == other[0].internal
+            end)),
+            "__neq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal != other[0].internal
+            end))
         }
     end
 
@@ -387,7 +486,13 @@ class Block < DataType
             "__call" => (NativeFnInternal.new (Proc.new do |args, scope|
                 call args, scope
             end)),
-            "__arity" => (Int.new 1)
+            "__arity" => (Int.new 1),
+            "__eq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal == other[0].internal
+            end)),
+            "__neq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal != other[0].internal
+            end))
         }
     end
 
@@ -414,7 +519,13 @@ class Obj < DataType
             "__new" => (NativeFnInternal.new (Proc.new do |args, scope|
                 _new args, scope
             end)),
-            "__arity" => (Int.new args.size)
+            "__arity" => (Int.new args.size),
+            "__eq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal == other[0].internal
+            end)),
+            "__neq" => (NativeFnInternal.new (lambda do |other|
+                Bool.new @internal != other[0].internal
+            end))
         }
     end
 

data/lib/sdx/vm/vm.rb

@@ -2,17 +2,13 @@ require 'sdx/vm/variables'
 require 'sdx/vm/datatypes'
 require 'sdx/vm/scope'
 
-def stringify(val)
-    if val.value.fields["__as_string"]
-        (val.value.fields["__as_string"].call).internal
-    else
-        val.value.to_s
-    end
-end
-
 def codify(val)
     if val.value.fields["__as_code_string"]
-        (val.value.fields["__as_code_string"].call).internal
+        if val.value.fields["__as_code_string"].respond_to? :call
+            (val.value.fields["__as_code_string"].call).internal
+        else
+            (val.value.fields["__as_code_string"].fields["__call"].call [], val.scope).internal
+        end
     else
         val.value.pretty_inspect
     end
@@ -22,10 +18,22 @@ class VM
     attr_accessor :bc_io
     
     def truthy(val)
+        case val.value
+        when Bool
+            return val.value.internal
+        end
         if val.value.fields["__as_bool"]
-            (val.value.fields["__as_bool"].call).internal
+            return (val.value.fields["__as_bool"].call).internal
         else
-            true
+            return true
+        end
+    end
+
+    def stringify(val)
+        if val.value.fields["__as_string"]
+            (call val.value.fields["__as_string"], [], val.scope).internal
+        else
+            val.value.to_s
         end
     end
     
@@ -51,7 +59,7 @@ class VM
         when String
             to_var (Str.new val)
         when Float
-            to_var (Str.new val)
+            to_var (Num.new val)
         when Array
             to_var (List.new val.map { |v| from_rb v })
         when Nil
@@ -135,6 +143,7 @@ class VM
             0x24 => :sub,
             0x25 => :mul,
             0x26 => :div,
+            0x27 => :mod,
             0x12 => :bool,
             0x13 => :int,
             0x14 => :str,
@@ -150,7 +159,13 @@ class VM
             0x30 => :object,
             0x31 => :new,
             0x32 => :block,
-            0x33 => :end
+            0x33 => :end,
+            0x34 => :eq,
+            0x35 => :ne,
+            0x36 => :lt,
+            0x37 => :gt,
+            0x38 => :le,
+            0x39 => :ge
         }
         bytes = []
         begin
@@ -264,12 +279,19 @@ class VM
                         vals << pop_from_stack
                     end
                     vals.reverse!
-                    push_to_stack Variable.new (List.new vals), :list, @global
+                    push_to_stack Variable.new (List.new vals, @global), :list, @global
                 when :block
                     size = get_string.to_i
                     body = 
                         ((load_bytes size, false).map { |e| e.chr }).join ""
                     push_to_stack Variable.new (Block.new body), :block, @global
+                when :bool
+                    val = get_string
+                    t = {
+                        "true" => true,
+                        "false" => false,
+                    }
+                    push_to_stack Variable.new (Bool.new t[val]), :bool, @global
                 when :nil
                     push_to_stack Variable.new (Nil.new), :nil, @global
                 end
@@ -279,7 +301,7 @@ class VM
                     res = (call a.value.fields["__add"], b.value)
                     push_to_stack (to_var res)
                 else
-                    error "Cannot add to #{a.type}"
+                    error "Cannot use + on #{a.type}"
                 end
             when :sub
                 b, a = pop_from_stack, pop_from_stack
@@ -287,7 +309,7 @@ class VM
                     res = (call a.value.fields["__sub"], b.value)
                     push_to_stack (Variable.new res, (get_type res), @global) 
                 else
-                    error "Cannot subtract from #{a.type}"
+                    error "Cannot use - on #{a.type}"
                 end
             when :mul
                 b, a = pop_from_stack, pop_from_stack
@@ -295,7 +317,7 @@ class VM
                     res = (call a.value.fields["__mul"], b.value)
                     push_to_stack (Variable.new res, (get_type res), @global) 
                 else
-                    error "Cannot multiply #{a.type}"
+                    error "Cannot use * on #{a.type}"
                 end
             when :div
                 b, a = pop_from_stack, pop_from_stack
@@ -303,7 +325,7 @@ class VM
                     res = (call a.value.fields["__div"], b.value)
                     push_to_stack (Variable.new res, (get_type res), @global) 
                 else
-                    error "Cannot divide #{a.type}"
+                    error "Cannot use / on #{a.type}"
                 end
             when :mod
                 b, a = pop_from_stack, pop_from_stack
@@ -311,7 +333,7 @@ class VM
                     res = (call a.value.fields["__mod"], b.value)
                     push_to_stack (Variable.new res, (get_type res), @global) 
                 else
-                    error "Cannot modulo #{a.type}"
+                    error "Cannot use % on #{a.type}"
                 end
             when :pow
                 b, a = pop_from_stack, pop_from_stack
@@ -319,7 +341,55 @@ class VM
                     res = (call a.value.fields["__pow"], b.value)
                     push_to_stack (Variable.new res, (get_type res), @global) 
                 else
-                    error "Cannot exponentiate #{a.type}"
+                    error "Cannot use ^ on #{a.type}"
+                end
+            when :eq
+                b, a = pop_from_stack, pop_from_stack
+                if a.value.fields["__eq"]
+                    res = (call a.value.fields["__eq"], b.value)
+                    push_to_stack (Variable.new res, (get_type res), @global) 
+                else
+                    error "Cannot use == on #{a.type}"
+                end
+            when :ne
+                b, a = pop_from_stack, pop_from_stack
+                if a.value.fields["__neq"]
+                    res = (call a.value.fields["__neq"], b.value)
+                    push_to_stack (Variable.new res, (get_type res), @global) 
+                else
+                    error "Cannot use != on #{a.type}"
+                end
+            when :lt
+                b, a = pop_from_stack, pop_from_stack
+                if a.value.fields["__lt"]
+                    res = (call a.value.fields["__lt"], b.value)
+                    push_to_stack (Variable.new res, (get_type res), @global) 
+                else
+                    error "Cannot use < on #{a.type}"
+                end
+            when :gt
+                b, a = pop_from_stack, pop_from_stack
+                if a.value.fields["__gt"]
+                    res = (call a.value.fields["__gt"], b.value)
+                    push_to_stack (Variable.new res, (get_type res), @global) 
+                else
+                    error "Cannot use > on #{a.type}"
+                end
+            when :le
+                b, a = pop_from_stack, pop_from_stack
+                if a.value.fields["__le"]
+                    res = (call a.value.fields["__le"], b.value)
+                    push_to_stack (Variable.new res, (get_type res), @global) 
+                else
+                    error "Cannot use <= on #{a.type}"
+                end
+            when :ge
+                b, a = pop_from_stack, pop_from_stack
+                if a.value.fields["__ge"]
+                    res = (call a.value.fields["__ge"], b.value)
+                    push_to_stack (Variable.new res, (get_type res), @global) 
+                else
+                    error "Cannot use >= on #{a.type}"
                 end
             when :jmpi
                 val = pop_from_stack

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sardonyx
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.85
 platform: ruby
 authors:
 - sugarfi