sardonyx 0.1.7 → 0.1.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '023920f36be61ea604ad6c69e66b71c2f9f9c0696b0a5679e129d7b284e1345e'
-  data.tar.gz: 88f14b9b1aa7a253f564c8e40e9e1ad4589b62cc6ef1ead28a4bc08461017db6
+  metadata.gz: f381674f5e870ec9ac7fe8f9ce699b1e851c7314ad9480201710bcd32e665185
+  data.tar.gz: c42b1e66d327aa8bc0e39075c3778bd3b40beb7c82d47edce91a601418a82408
 SHA512:
-  metadata.gz: eb029ebb6e35edfa9daf634b6553c69d4adf109af83916341b1809b00e3abbd1bc07eb31175ad94c95742f367c2e5cc06d1fc0e61ce74d4329022895e189c077
-  data.tar.gz: c955957d5e26dd5559941c4a24f14ab8d0ba5a39f82c94fd891a3afd6f24be09362bbf83f11b61bc552c277fb52e2ced701e9c6cd3facae9955750d1b5b98f9e
+  metadata.gz: 43c77a34a4edf0b6a87af9183004a57d8cb285f115159240b5798c8ce37723e2f9018c5f5a630d2f7c102cbf50a42f181eee30685f74cf2ede839f1e5a224a72
+  data.tar.gz: 83d259340d9dec63f6696de3a3d76832bc7c98880634df1139f5cd89042d7c7eb5c8cad1d27062fa027174344583a593d37698c96aac19328c7965b047d4ea34

data/bin/sdx

@@ -15,7 +15,7 @@ if ARGV.size == 1
 else
     path = [(File.expand_path Dir.pwd), *(ENV.fetch("SDX_PATH", "").split ":")]
     vm = VM.new StringIO.new ""
-    puts "Sardonyx v0.1.7"
+    puts "Sardonyx v0.1.8"
     def exit(_) end
     loop do
         print "> "
@@ -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,
@@ -113,6 +113,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 +172,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 +184,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_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

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,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
@@ -272,34 +358,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 +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)
@@ -361,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
 
@@ -387,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
 
@@ -414,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,14 +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
@@ -28,6 +20,14 @@ 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 call(val, *args)
         if val.respond_to? :value and val.value.respond_to? :fields
@@ -43,6 +43,21 @@ class VM
             return (to_var val).value.call args
         end
     end
+
+    def from_rb(val)
+        case val
+        when Integer
+            to_var (Int.new val)
+        when String
+            to_var (Str.new val)
+        when Float
+            to_var (Float.new val)
+        when Array
+            to_var (List.new val.map { |v| from_rb v })
+        when Nil
+            to_var (Nil_.new)
+        end
+    end
     
     def callable(val)
         if val.respond_to? :value and val.value.respond_to? :fields
@@ -84,7 +99,7 @@ class VM
         @global = GLOBAL_SCOPE.new
         @global.add_fn "__rb_call", (Variable.new (NativeFn.new 2, (Proc.new do |name, args|
             args = (codify args)[1..-2]
-            eval "#{name.value.internal}(#{args})"
+            from_rb eval "#{name.value.internal}(#{args})"
         end)), :fn, @global)
         @stack = []
         @byte_pos = 0
@@ -120,6 +135,7 @@ class VM
             0x24 => :sub,
             0x25 => :mul,
             0x26 => :div,
+            0x27 => :mod,
             0x12 => :bool,
             0x13 => :int,
             0x14 => :str,
@@ -135,7 +151,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,7 +286,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
@@ -272,7 +294,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
@@ -280,7 +302,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
@@ -288,7 +310,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
@@ -296,7 +318,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
@@ -304,7 +326,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.7
+  version: 0.1.84
 platform: ruby
 authors:
 - sugarfi