sardonyx 0.1.82 → 0.1.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a384634a4bfdce5ea555978895b81d96a5d4d916375bc192a739493920d6d8bf
-  data.tar.gz: 38fc8ac4918a9cbbe7f3e4a06e7b053ee99132b4a49c2b434fe82384b78d2f9d
+  metadata.gz: 4cc308366fad5b10c92dec85090d721e7e609d461aec60e7cf8f319a5a542a0e
+  data.tar.gz: 033f7e434ffae2192f194ef1a7933c52f400be53ef4bdeb9b7719afecd56dfbb
 SHA512:
-  metadata.gz: 6cc678adbf5ae8f5059b05934d8934e0c33e43cda2842bdf54e606238d221fba49c0133984cb7bcbe0de0a79a3cb692758c60797d3cad53732b6bc2ade48324d
-  data.tar.gz: 417c8e9ee3cf5cf62b3f95962712f60b72f156bd4cdbe9a685101c6df9fed101c7533be14037057481e273e5b7fb79efb57f87ea9e4f8fbbfc330b9e248dbcdf
+  metadata.gz: 5ecf245af7c547d02cefe94b2d2bd0279051e14977c4f4b4e5ee2c156fce6cd3f3407fb2474dca295fdaf6d08704bd3065ff28624700dccd40c0b679b89bd05c
+  data.tar.gz: 2575dc2a542a141742645687f0c4bb0e93995760d621295be3b6fbd9907159221627c6ae622b33ec14db57f4335b1e0b8022578e8c71c241b7986919ffacbff3

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

data/lib/sdx/compiler/parser.rb

@@ -10,7 +10,7 @@ module Parser
             /\Aobject/ => :object,
             /\Anew/ => :new,
             /\Arequire/ => :require,
-            /\A(<|>|<=|>=|==)/ => :op,
+            /\A(<|>|<=|>=|==|!=)/ => :op,
             /\A(\+|-|\*|\/|%)?=/ => :eq,
             /\A(\+|-|\*|\/|%)/ => :op,
             /\A-?[0-9]+/ => :number,

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
@@ -99,6 +105,24 @@ class Int < DataType
             end)),
             "__pow" => (NativeFnInternal.new (Proc.new do |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 
@@ -153,6 +193,12 @@ class Str < DataType
             end)),
             "__mul" => (NativeFnInternal.new (Proc.new do |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
@@ -206,6 +252,24 @@ class Num < DataType
             end)),
             "__pow" => (NativeFnInternal.new (Proc.new do |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,6 +329,12 @@ 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
@@ -280,11 +366,18 @@ class List < DataType
             "__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 = ""
         @internal.each do |item|
             s += (stringify item) + ", "
         end
@@ -294,6 +387,7 @@ class List < DataType
     end
 
     def as_code_string
+        s = ""
         @internal.each do |item|
             s += (codify item) + ", "
         end
@@ -312,12 +406,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), @internal[0].scope)]
     end
 
     def mul(other)
@@ -359,7 +453,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
 
@@ -385,7 +485,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
 
@@ -412,7 +518,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,22 +2,6 @@ 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
-    else
-        val.value.pretty_inspect
-    end
-end
-
 class VM
     attr_accessor :bc_io
     
@@ -28,6 +12,22 @@ class VM
             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
+    
+    def codify(val)
+        if val.value.fields["__as_code_string"]
+            (call val.value.fields["__as_code_string"], [], val.scope).internal
+        else
+            val.value.pretty_inspect
+        end
+    end
     
     def call(val, *args)
         if val.respond_to? :value and val.value.respond_to? :fields
@@ -150,7 +150,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
@@ -279,7 +285,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 +293,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 +301,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 +309,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 +317,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 +325,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.82
+  version: 0.1.83
 platform: ruby
 authors:
 - sugarfi