sardonyx 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 134db5d432fc5be113fff903e155f16cfd8d756b3ee89846cb542fe282d831d0
-  data.tar.gz: a89c2707cb7a86c09f6ac5afe265bff9913d55c87346f7ffc75c274c0436b042
+  metadata.gz: a1e2303504b396f3aea3b179bb7fd511de36490784a1763599712fb53c2a9448
+  data.tar.gz: 4092253d393f90075180acc3cad50bcd1f5d2a2377e3a0d2d853b93cb9902d72
 SHA512:
-  metadata.gz: ae6c5e8daab94393ae813c3980950ad3cf22e075820f6cdbef46cab336283098bf2aa9d80008185cba53493ea78297fec3b5c0171124082fa50f38243f83b9c7
-  data.tar.gz: 2279b27b460bc419e3992d78548e46503eec909695f813e0a6072dcc777ecfc35da19e8ab614de60f0e0356a22711ad391753bafa732b848745fe04cd35db64b
+  metadata.gz: 3f89fd078c871701eee5ddc6f8a8306666da58d6ffc4e6050e6bd2a80dbb2c31903dfb3c86c7155e5f1477104305016b64b8bcf336b7c0d9b63b881582bf3813
+  data.tar.gz: b9ebed85a007ca9ca7872b9db44e75173fb6db412d8a88c00f968a1685c47084b71f7baf5857a786b836ab905c84b74970b67f76eda75c4d633aa788ecfe4e88

data/bin/sdx

@@ -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

@@ -276,6 +276,10 @@ class List < DataType
             end)),
             "__mul" => (NativeFnInternal.new (Proc.new do |other|
                 mul other
+            end)),
+            "__arity" => (Int.new 1),
+            "__call" => (NativeFnInternal.new (Proc.new do |args, scope|
+                @internal[args[0].value.internal]
             end))
         }
     end
@@ -341,6 +345,8 @@ def get_type(x)
         :num
     when Obj
         :object
+    when Block
+        :block
     end
 end
 
@@ -373,6 +379,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

@@ -98,6 +98,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 +133,9 @@ class VM
             0x2d => :reset,
             0x2e => :iter,
             0x30 => :object,
-            0x31 => :new
+            0x31 => :new,
+            0x32 => :block,
+            0x33 => :end
         }
         bytes = []
         begin
@@ -186,7 +192,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 +250,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 +341,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

metadata

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