sardonyx 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb1abb1054bac034790200a964982214b49e23fc6d7d770d0fd04891dfa6e347
-  data.tar.gz: ae202ff163082b2cc8796a9ff961a22a0acceb31f70cfdd9b02736bc2c2c6e56
+  metadata.gz: d0c5b5dabcbc157b1423ad023f21c3a892937bf6046050a83da1470e7ce724a1
+  data.tar.gz: f386cc4507d301b80f807a231ef2bd8af4140114bb7d3760bdf2847fdd73b843
 SHA512:
-  metadata.gz: 62fdce49d54f1a3a57b8865390a2c2145d043db991c4982821299f726b2d268e15d5cd675b4ecaa05b03d2b159ec66d1fa5f03ddcba2b0d30733677d26465201
-  data.tar.gz: 1379d7546a69f008fd3c9b1d632ac5f42e1dfc887972c59dec4adf1b00d88251a02e8551d5fd8a03260cfe680ab860540a40191388a3bf051f4579d3b5f8d3b6
+  metadata.gz: 714886d2d100b7ac440f7dd56cb8e9bf0f7ae880d67778775fe900b8b179f99f9d47f5404cb313515923a32f2fbb2d0e71527da296357b3ca3e5ddbb12963120
+  data.tar.gz: 5fc4e31a81de969b3714ab40b1c12e4c792d27efbd96c36292d1cea570cbae0de0865b7b8e412c560113cdd910aa5d7c80df834cf12df4fc7a3b4a9b402704d8

data/bin/sdx

@@ -5,7 +5,7 @@ require "sdx/vm/vm"
 require "stringio"
 require "readline"
 
-if (ENV.fetch("SDX_PATH", "").split ":")
+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
 
@@ -22,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.1"
+    puts "Sardonyx v0.3.6"
     puts "Type :help for help, or :exit to exit"
     loop do
         begin
@@ -50,8 +50,8 @@ else
                 vm.interpret false
                 val = vm.stack[-1]
                 vm.clear
-                if val
-                    puts vm.stringify val
+                if val and State::state == :ok
+                    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/datatypes.rb

@@ -1,4 +1,5 @@
 require "stringio"
+require "bigdecimal"
 
 class DataType 
     attr_reader :internal
@@ -51,10 +52,10 @@ class Bool < DataType
             @internal = false
         end
         @fields = {
-            "__as_string" => (NativeFn.new 0, (Proc.new do
+            "__as_str" => (NativeFn.new 0, (Proc.new do
                 as_string
             end)),
-            "__as_code_string" => (NativeFn.new 0, (Proc.new do
+            "__as_code_str" => (NativeFn.new 0, (Proc.new do
                 as_string
             end)),
             "__eq" => (NativeFnInternal.new (lambda do |other|
@@ -77,10 +78,10 @@ class Int < DataType
             @internal = val
         end
         @fields = {
-            "__as_string" => (NativeFnInternal.new (Proc.new do
+            "__as_str" => (NativeFnInternal.new (Proc.new do
                 as_string
             end)),
-            "__as_code_string" => (NativeFnInternal.new (Proc.new do
+            "__as_code_str" => (NativeFnInternal.new (Proc.new do
                 as_string
             end)),
             "__as_bool" => (NativeFnInternal.new (Proc.new do
@@ -134,42 +135,112 @@ class Int < DataType
     end
 
     def add(other)
+        case other
+        when Int
+        when Num
+        else
+            error "Cannot use Int + on #{other.class}"
+            return nil
+        end
         Int.new @internal + other.internal
     end
 
     def sub(other)
+        case other
+        when Int
+        when Num
+        else
+            error "Cannot use Int - on #{other.class}"
+            return nil
+        end
         Int.new @internal - other.internal
     end
 
     def mul(other)
+        case other
+        when Int
+        when Num
+        else
+            error "Cannot use Int * on #{other.class}"
+            return nil
+        end
         Int.new @internal * other.internal
     end
 
     def div(other)
-        Int.new @internal / other.internal
+        case other
+        when Int
+        when Num
+        else
+            error "Cannot use Int / on #{other.class}"
+            return nil
+        end
+        Num.new (@internal / (other.internal / 1.0)).to_s
     end
 
     def mod(other)
+        case other
+        when Int
+        when Num
+        else
+            error "Cannot use Int % on #{other.class}"
+            return nil
+        end
         Int.new @internal % other.internal
     end
 
     def pow(other)
+        case other
+        when Int
+        when Num
+        else
+            error "Cannot use Int ^ on #{other.class}"
+            return nil
+        end
         Int.new @internal ** other.internal
     end
 
     def lt(other)
+        case other
+        when Int
+        when Num
+        else
+            error "Cannot use Int < on #{other.class}"
+            return nil
+        end
         Bool.new @internal < other.internal
     end
 
     def gt(other)
+        case other
+        when Int
+        when Num
+        else
+            error "Cannot use Int > on #{other.class}"
+            return nil
+        end
         Bool.new @internal > other.internal
     end
 
     def le(other)
+        case other
+        when Int
+        when Num
+        else
+            error "Cannot use Int <= on #{other.class}"
+            return nil
+        end
         Bool.new @internal <= other.internal
     end
 
     def ge(other)
+        case other
+        when Int
+        when Num
+        else
+            error "Cannot use Int >= on #{other.class}"
+            return nil
+        end
         Bool.new @internal >= other.internal
     end
 end
@@ -180,10 +251,10 @@ class Str < DataType
             @internal = val
         end
         @fields = {
-            "__as_string" => (NativeFnInternal.new (Proc.new do 
+            "__as_str" => (NativeFnInternal.new (Proc.new do 
                 as_string
             end)),
-            "__as_code_string" => (NativeFnInternal.new (Proc.new do
+            "__as_code_str" => (NativeFnInternal.new (Proc.new do
                 as_code_string
             end)),
             "__add" => (NativeFnInternal.new (Proc.new do |other|
@@ -210,10 +281,22 @@ class Str < DataType
     end
 
     def add(other)
+        case other
+        when Str
+        else
+            error "Cannot use Str + on #{other.class}"
+            return nil
+        end
         Str.new @internal + other.internal
     end
 
     def mul(other)
+        case other
+        when Int
+        else
+            error "Cannot use Int * on #{other.class}"
+            return nil
+        end
         Str.new @internal * other.internal
     end
 end
@@ -221,13 +304,13 @@ end
 class Num < DataType
     def initialize(val=nil)
         if val != nil
-            @internal = val
+            @internal = BigDecimal val
         end
         @fields = {
-            "__as_string" => (NativeFnInternal.new (Proc.new do
+            "__as_str" => (NativeFnInternal.new (Proc.new do
                 as_string
             end)),
-            "__as_code_string" => (NativeFnInternal.new (Proc.new do
+            "__as_code_str" => (NativeFnInternal.new (Proc.new do
                 as_string
             end)),
             "__as_bool" => (NativeFnInternal.new (Proc.new do
@@ -273,7 +356,7 @@ class Num < DataType
     end
 
     def as_string
-        Str.new @internal.to_s
+        Str.new (@internal.to_s "F")
     end
 
     def as_bool
@@ -281,42 +364,112 @@ class Num < DataType
     end
 
     def add(other)
+        case other
+        when Num
+        when Int
+        else
+            error "Cannot use Num + on #{other.class}"
+            return nil
+        end
         Num.new @internal + other.internal
     end
 
     def sub(other)
+        case other
+        when Num
+        when Int
+        else
+            error "Cannot use Num - on #{other.class}"
+            return nil
+        end
         Num.new @internal - other.internal
     end
 
     def mul(other)
+        case other
+        when Num
+        when Int
+        else
+            error "Cannot use Num * on #{other.class}"
+            return nil
+        end
         Num.new @internal * other.internal
     end
 
     def div(other)
+        case other
+        when Num
+        when Int
+        else
+            error "Cannot use Num / on #{other.class}"
+            return nil
+        end
         Num.new @internal / other.internal
     end
 
     def mod(other)
+        case other
+        when Num
+        when Int
+        else
+            error "Cannot use Num % on #{other.class}"
+            return nil
+        end
         Num.new @internal % other.internal
     end
 
     def pow(other)
+        case other
+        when Num
+        when Int
+        else
+            error "Cannot use Num ^ on #{other.class}"
+            return nil
+        end
         Num.new @internal ** other.internal
     end
 
     def lt(other)
+        case other
+        when Num
+        when Int
+        else
+            error "Cannot use Num < on #{other.class}"
+            return nil
+        end
         Bool.new @internal < other.internal
     end
 
     def gt(other)
+        case other
+        when Num
+        when Int
+        else
+            error "Cannot use Num > on #{other.class}"
+            return nil
+        end
         Bool.new @internal > other.internal
     end
 
     def le(other)
+        case other
+        when Num
+        when Int
+        else
+            error "Cannot use Num <= on #{other.class}"
+            return nil
+        end
         Bool.new @internal <= other.internal
     end
 
     def ge(other)
+        case other
+        when Num
+        when Int
+        else
+            error "Cannot use Num >= on #{other.class}"
+            return nil
+        end
         Bool.new @internal >= other.internal
     end
 end
@@ -328,6 +481,9 @@ class Nil < DataType
             "__as_bool" => (NativeFnInternal.new (Proc.new do
                 Bool.new false
             end)),
+            "__as_str" => (NativeFnInternal.new (Proc.new do
+                Str.new "nil"
+            end)),
             "__eq" => (NativeFnInternal.new (lambda do |other|
                 Bool.new @internal == other[0].internal
             end)),
@@ -344,10 +500,10 @@ class List < DataType
         @scope = scope
         @pos = 0
         @fields = {
-            "__as_string" => (NativeFnInternal.new (Proc.new do 
+            "__as_str" => (NativeFnInternal.new (Proc.new do 
                 as_string
             end)),
-            "__as_code_string" => (NativeFnInternal.new (Proc.new do
+            "__as_code_str" => (NativeFnInternal.new (Proc.new do
                 as_code_string
             end)),
             "__reset" => (NativeFnInternal.new (Proc.new do 
@@ -414,6 +570,12 @@ class List < DataType
     end
 
     def mul(other)
+        case other
+        when Int
+        else
+            error "Cannot use List * on #{other.class}"
+            return nil
+        end
         return List.new @internal * other.internal
     end
 end

data/lib/sdx/vm/vm.rb

@@ -3,17 +3,34 @@ require 'sdx/vm/datatypes'
 require 'sdx/vm/scope'
 
 def codify(val)
-    if val.value.fields["__as_code_string"]
-        if val.value.fields["__as_code_string"].respond_to? :call
-            (val.value.fields["__as_code_string"].call).internal
+    if val.value.fields["__as_code_str"]
+        if val.value.fields["__as_code_str"].respond_to? :call
+            (val.value.fields["__as_code_str"].call).internal
         else
-            (val.value.fields["__as_code_string"].fields["__call"].call [], val.scope).internal
+            (val.value.fields["__as_code_str"].fields["__call"].call [], val.scope).internal
         end
     else
         val.value.pretty_inspect
     end
 end
 
+def stringify(val)
+    if val.value.fields["__as_str"]
+        if val.value.fields["__as_str"].respond_to? :fields
+            (val.value.fields["__as_str"].fields["__call"].call [], val.scope).internal
+        else
+            (val.value.fields["__as_str"]).call.internal
+        end
+    else
+        val.value.to_s
+    end
+end
+
+def error(msg)
+    puts "\x1b[0;31mError in VM: #{msg}\x1b[0;0m"
+    State::state = :error
+end
+
 class VM
     attr_accessor :bc_io
     
@@ -28,14 +45,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
@@ -109,6 +118,62 @@ class VM
             args = (codify args)[1..-2]
             from_rb eval "#{name.value.internal}(#{args})"
         end)), :fn, @global)
+        @global.add_fn "__is_int", (Variable.new (NativeFn.new 1, (Proc.new do |n|
+            case n.value
+            when Int
+                to_var (Bool.new true)
+            else
+                to_var (Bool.new false)
+            end
+        end)), :fn, @global)
+        @global.add_fn "__is_num", (Variable.new (NativeFn.new 1, (Proc.new do |n|
+            case n.value
+            when Num
+                to_var (Bool.new true)
+            else
+                to_var (Bool.new false)
+            end
+        end)), :fn, @global)
+        @global.add_fn "__is_str", (Variable.new (NativeFn.new 1, (Proc.new do |n|
+            case n.value
+            when Str
+                to_var (Bool.new true)
+            else
+                to_var (Bool.new false)
+            end
+        end)), :fn, @global)
+        @global.add_fn "__is_list", (Variable.new (NativeFn.new 1, (Proc.new do |n|
+            case n.value
+            when List
+                to_var (Bool.new true)
+            else
+                to_var (Bool.new false)
+            end
+        end)), :fn, @global)
+        @global.add_fn "__is_bool", (Variable.new (NativeFn.new 1, (Proc.new do |n|
+            case n.value
+            when Bool
+                to_var (Bool.new true)
+            else
+                to_var (Bool.new false)
+            end
+        end)), :fn, @global)
+        @global.add_fn "__is_list", (Variable.new (NativeFn.new 1, (Proc.new do |n|
+            case n.value
+            when List
+                to_var (Bool.new true)
+            else
+                to_var (Bool.new false)
+            end
+        end)), :fn, @global)
+        @global.add_fn "__is_nil", (Variable.new (NativeFn.new 1, (Proc.new do |n|
+            case n.value
+            when Nil
+                to_var (Bool.new true)
+            else
+                to_var (Bool.new false)
+            end
+        end)), :fn, @global)
         @stack = []
         @byte_pos = 0
     end
@@ -271,7 +336,7 @@ class VM
                     push_to_stack Variable.new (Int.new val.to_i), :int, @global
                 when :num
                     val = get_string
-                    push_to_stack Variable.new (Num.new val.to_f), :num, @global
+                    push_to_stack Variable.new (Num.new val), :num, @global
                 when :str
                     val = get_string
                     push_to_stack Variable.new (Str.new val), :str, @global

metadata

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