sardonyx 0.1.5 → 0.1.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 134db5d432fc5be113fff903e155f16cfd8d756b3ee89846cb542fe282d831d0
-  data.tar.gz: a89c2707cb7a86c09f6ac5afe265bff9913d55c87346f7ffc75c274c0436b042
+  metadata.gz: a384634a4bfdce5ea555978895b81d96a5d4d916375bc192a739493920d6d8bf
+  data.tar.gz: 38fc8ac4918a9cbbe7f3e4a06e7b053ee99132b4a49c2b434fe82384b78d2f9d
 SHA512:
-  metadata.gz: ae6c5e8daab94393ae813c3980950ad3cf22e075820f6cdbef46cab336283098bf2aa9d80008185cba53493ea78297fec3b5c0171124082fa50f38243f83b9c7
-  data.tar.gz: 2279b27b460bc419e3992d78548e46503eec909695f813e0a6072dcc777ecfc35da19e8ab614de60f0e0356a22711ad391753bafa732b848745fe04cd35db64b
+  metadata.gz: 6cc678adbf5ae8f5059b05934d8934e0c33e43cda2842bdf54e606238d221fba49c0133984cb7bcbe0de0a79a3cb692758c60797d3cad53732b6bc2ade48324d
+  data.tar.gz: 417c8e9ee3cf5cf62b3f95962712f60b72f156bd4cdbe9a685101c6df9fed101c7533be14037057481e273e5b7fb79efb57f87ea9e4f8fbbfc330b9e248dbcdf

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 v 0.0.1"
+    puts "Sardonyx v0.1.8"
     def exit(_) end
     loop do
         print "> "
@@ -25,8 +25,11 @@ else
         bc = Compiler::Compiler.compile ast
         vm.bc_io = StringIO.new bc
         vm.byte_pos = 0
-        vm.interpret
+        vm.interpret false
         val = vm.stack[-1]
-        puts stringify val
+        vm.clear
+        if val
+            puts stringify val
+        end
     end
 end

data/lib/sdx/compiler/compiler.rb

@@ -4,6 +4,7 @@ module Compiler
             bc = ""
             ast.each do |line|
                 bc += self.encode_node line
+                bc += "\x33"
             end
             bc + "\x16"
         end
@@ -34,6 +35,14 @@ module Compiler
                 bc += "\x21\x15#{node.value}\x18"
             when :string
                 bc += "\x21\x14#{node.value}\x18"
+            when :block
+                b = ""
+                node.children.each do |child|
+                    b += (self.encode_node child) + "\x33"
+                end
+                b = b[0..-2]
+                b += "\x16"
+                bc += "\x21\x32#{b.size}\x18#{b}"
             when :call
                 node.children.each do |item|
                     bc += self.encode_node item

data/lib/sdx/compiler/parser.rb

@@ -171,7 +171,7 @@ module Parser
         end
 
         def self.parse_literal(tokens)
-            self.parse_float(tokens) || (self.parse_block 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)
         end
 
         def self.parse_call(tokens)

data/lib/sdx/vm/datatypes.rb

@@ -36,7 +36,7 @@ class NativeFn < DataType
     def initialize(arity, val)
         @internal = val
         @fields = {
-            "__call" => (NativeFnInternal.new (Proc.new do |args|
+            "__call" => (NativeFnInternal.new (lambda do |args, scope|
                 args.reverse!
                 @internal.call *args
             end)),
@@ -83,22 +83,22 @@ 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))
         }
     end
@@ -149,10 +149,10 @@ 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))
         }
     end
@@ -162,7 +162,7 @@ class Str < DataType
     end
 
     def as_code_string
-        (Str.new "\"#{@internal}\"")
+        (Str.new @internal.dump)
     end
 
     def add(other)
@@ -190,22 +190,22 @@ 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))
         }
     end
@@ -272,30 +272,32 @@ 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))
         }
     end
 
     def as_string
-        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 = "["
         @internal.each do |item|
             s += (codify item) + ", "
         end
-        s = s[0..-3]
+        s = "[" + s[0..-3]
         s += "]"
         Str.new s
     end
@@ -341,6 +343,8 @@ def get_type(x)
         :num
     when Obj
         :object
+    when Block
+        :block
     end
 end
 
@@ -352,7 +356,7 @@ class Function < DataType
         @internal = body
 
         @fields = {
-            "__call" => (NativeFnInternal.new (Proc.new do |args, scope|
+            "__call" => (NativeFnInternal.new (lambda do |args, scope|
                 call args, scope
             end)),
             "__arity" => (Int.new args.size)
@@ -373,6 +377,30 @@ class Function < DataType
     end
 end
 
+class Block < DataType
+    def initialize(body)
+        @internal = body
+
+        @fields = {
+            "__call" => (NativeFnInternal.new (Proc.new do |args, scope|
+                call args, scope
+            end)),
+            "__arity" => (Int.new 1)
+        }
+    end
+
+    def call(passed, scope)
+        passed.reverse!
+        vm = VM.new StringIO.new @internal
+        scope.variables.each do |k|
+            vm.global.add_var k[0], (scope.get_var k[0])
+        end
+        vm.global.add_var "_", passed[0]
+        vm.interpret
+        vm.stack[-1]
+    end
+end
+
 class Obj < DataType
     attr_reader :args
 

data/lib/sdx/vm/vm.rb

@@ -35,12 +35,27 @@ class VM
             when Function
                 return val.value.fields["__call"].call args.map { |x| to_var x }, val.scope
             else
-                return val.value.fields["__call"].call *args
+                return val.value.fields["__call"].call args, val.scope
             end
         elsif val.respond_to? :fields
             return val.fields["__call"].call *args
         else
-            return (to_var val).value.call *args
+            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
     
@@ -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
@@ -98,6 +113,10 @@ class VM
     def byte_pos=(n)
         @byte_pos = n
     end
+
+    def clear
+        @stack = []
+    end
    
     def load_bytes(x_bytes, to_symbol=true) # loads in next x bytes from file, returns in array
         insts = { # just a simple hash to make interpreter code more readable 
@@ -129,7 +148,9 @@ class VM
             0x2d => :reset,
             0x2e => :iter,
             0x30 => :object,
-            0x31 => :new
+            0x31 => :new,
+            0x32 => :block,
+            0x33 => :end
         }
         bytes = []
         begin
@@ -186,7 +207,7 @@ class VM
         exit 1
     end
 
-    def interpret # builds stack from bytecode
+    def interpret(do_end=true) # builds stack from bytecode
         loop do  
             loaded_bytes = load_bytes(1) # loads in first byte for initial instruction
             break if loaded_bytes[0] == :end_prg # end of program reached 
@@ -244,6 +265,11 @@ class VM
                     end
                     vals.reverse!
                     push_to_stack Variable.new (List.new vals), :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 :nil
                     push_to_stack Variable.new (Nil.new), :nil, @global
                 end
@@ -330,6 +356,10 @@ class VM
                     res = call val.value.fields["__iter"]
                     push_to_stack res
                 end
+            when :end
+                if do_end
+                    @stack = []
+                end
             when :call
                 val = pop_from_stack
                 if callable val
@@ -341,16 +371,13 @@ class VM
                         end
                         args << this
                     end
-                    f = Proc.new do |args, scope|
-                        call val, args, scope
-                    end
                     scope = nil
                     begin
                         scope = val.scope
                     rescue
                         scope = @global
                     end
-                    ret = f.call args, scope
+                    ret = call val, *args
                     if ret
                         push_to_stack ret
                     end

metadata

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