sardonyx 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f1875caf3dde857e8ceb08f571c7c880dbca87ac78ab47db76cc892e651170a
-  data.tar.gz: 4a09ccbebfd19876454ffb9de6576352f4a1a536f5a953d93c884b1aa94a1bbb
+  metadata.gz: b6cb7504c3a8d3c20d609b052304da6f29006b61d4606b738fe0a33fc92753c8
+  data.tar.gz: 573d3b61d0031f2c1016ab4ba6d8b856f6ba8770e19b93610080735fb01efabf
 SHA512:
-  metadata.gz: 8eec611286cae7b68737ed8616b34db4eaf2e810c74591ef7809fec452c0987760298011757519748b1fee1a90641b2f76e860b3e32e1f0add69cc0cc1242125
-  data.tar.gz: 4d08a6dfe6066f4c0d9a98a0d428baf23a1190831c64b3a4b3530c43a41e3dd18065d70a8fc9331617a2234402aeacca92afae7a74d75aebb1c84f44d9aa45b3
+  metadata.gz: f8d4f48ba42b07b7bc29a367cb67492c7ca7f0c481f7556a2cecb28d2085be081330ebc3040469cadee489db420f015c2bf31969a2818f3b285ec24c0d101b4f
+  data.tar.gz: d6569e3d3607dfc50628b72952195e44289ac642412804330b54f82d8b6e3ad3afb863888a8f80c57e736c73e02f9bbee25f033a76dda87845d869753c4dbf9d

data/bin/sdx

@@ -5,6 +5,10 @@ require "sdx/vm/vm"
 require "stringio"
 require "readline"
 
+if (ENV.fetch("SDX_PATH", "").split ":") == []
+    puts "\x1b[0;33mLooks like you don't have anything in your SDX_PATH! You should install the stdlib at https://github.com/SardonyxLang/SardonyxStd.\x1b[0;0m"
+end
+
 if ARGV.size == 1
     path = [(File.expand_path File.dirname ARGV[0]), *(ENV.fetch("SDX_PATH", "").split ":")]
     code = File.read ARGV[0]
@@ -18,7 +22,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.3.0"
+    puts "Sardonyx v0.3.4"
     puts "Type :help for help, or :exit to exit"
     loop do
         begin
@@ -47,7 +51,7 @@ else
                 val = vm.stack[-1]
                 vm.clear
                 if val
-                    puts vm.stringify val
+                    puts stringify val
                 end
             end
         end

data/lib/sdx/compiler/compiler.rb

@@ -197,6 +197,9 @@ module Compiler
                     bc += self.encode_node item
                 end
                 bc += "\x21\x2c#{node.children.size}\x18"
+            when :return
+                bc += self.encode_node node.value
+                bc += "\x16"
             else
                 nil
             end

data/lib/sdx/compiler/parser.rb

@@ -23,6 +23,7 @@ module Parser
             /\Aobject/ => :object,
             /\Anew/ => :new,
             /\Arequire/ => :require,
+            /\Areturn/ => :return,
             /\A(true|false)/ => :bool,
             /\A-?[0-9]+\.[0-9]+/ => :float,
             /\A-?[0-9]+/ => :number,
@@ -674,11 +675,24 @@ Invalid code at #{line}:#{col}
             end
             [ (Node.new :require, tokens[0][0][1..-2], []), 2 ]
         end
+
+        def self.parse_return(tokens)
+            unless self.expect tokens, :return
+                return nil
+            end
+            tokens = tokens[1..-1]
+            res = self.parse_expr tokens
+            unless res
+                return nil
+            end
+            [ (Node.new :return, res[0], []), res[1] ]
+        end
             
         def self.parse_expr(tokens)
             (self.parse_op tokens)  || 
             (self.parse_call tokens) || 
             (self.parse_require tokens) || 
+            (self.parse_return tokens) ||
             (self.parse_new tokens) || 
             (self.parse_object tokens) || 
             (self.parse_fn tokens) || 
@@ -706,14 +720,15 @@ Invalid code at #{line}:#{col}
                         unless code
                             error "Cannot find file #{e[0].value}.sdx anywhere in path"
                             State::state = :error
+                            return nil
                         end
-                        lexed = Lexer.lex code
-                        ast = self.parse lexed, path, (code.split "\n")
-                        parsed.concat ast
+                        tokens = tokens[e[1]..-1]
+                        lexed, _ = Lexer.lex code
+                        tokens = [*lexed, *tokens]
                     else
                         parsed << e[0]
+                        tokens = tokens[e[1]..-1]
                     end
-                    tokens = tokens[e[1]..-1]
                 else
                     error %{
 Unexpected token #{tokens[0][1]} at #{tokens[0][2]}:#{tokens[0][3]}

data/lib/sdx/vm/vm.rb

@@ -14,6 +14,18 @@ def codify(val)
     end
 end
 
+def stringify(val)
+    if val.value.fields["__as_string"]
+        if val.value.fields["__as_string"].respond_to? :fields
+            (val.value.fields["__as_string"].fields["__call"].call [], val.scope).internal
+        else
+            (val.value.fields["__as_string"]).call.internal
+        end
+    else
+        val.value.to_s
+    end
+end
+
 class VM
     attr_accessor :bc_io
     
@@ -28,14 +40,6 @@ class VM
             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
     
     def call(val, *args)
         if val.respond_to? :value and val.value.respond_to? :fields

metadata

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