sardonyx 0.1.85 → 0.1.841

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c24e6115400ff31393984b7220c4226ea6f6a4fc8f9ba146f8d9f3ce51f749b
-  data.tar.gz: e1b92b4d17872047f11fe869d988370898dbebc74f5fe2ba4cb5e8d0ede648ec
+  metadata.gz: 54495fa9b457fb450d812a6a09b57a3284b948e8e93e44ab97521a241bef0a3b
+  data.tar.gz: '06619369fdff53a992b948401115f98ba11319ff0d06bd0a29d73030e39e892e'
 SHA512:
-  metadata.gz: c87037ad33284bec4da7576040d214a45978ab5e018c5ef62152a2ae31858484df6f5f2e7899d6b29f9618a875d145f45960aa8c1efa22b97e60ff661b579eea
-  data.tar.gz: 2ed22a60d030ac9236075a3f97d992956753dc9c3cda125783f3e05f5c74c9d20ce3fe84a848b96b7933b2063efc9d1dd9a899f95d26957050dd7979de75d957
+  metadata.gz: ceb7a82b5e59a72b23063caa984e26ce4f3d9d44d41e826d1702613bdad7634f06606dd622c6751aa6f477d042a58c2191cda025bebea6aeb84c356ca9fec984
+  data.tar.gz: 71514ddd0dfe83eb7542b5686b194c396878f8d9a6da7652b7ca1f2f38cb4f6c114b31e84293df9d37d73777df4fa248a69c37170524d9c009c1d7c8de76ceb6

data/lib/sdx/compiler/compiler.rb

@@ -103,12 +103,10 @@ module Compiler
                     end
                     i += "\x2a#{e.size}\x18"
                 end
-                bc += "\x2b#{i.size}\x18" + i
+                bc += "\x29#{i.size}\x18" + i
                 if e
                     bc += e
                 end
-            when :bool
-                bc += "\x21\x12#{node.value}\x18"
             when :name
                 bc += "\x20#{node.value}\x18"
             when :nil

data/lib/sdx/compiler/parser.rb

@@ -10,13 +10,11 @@ module Parser
             /\Aobject/ => :object,
             /\Anew/ => :new,
             /\Arequire/ => :require,
-            /\A(true|false)/ => :bool,
-            /\A-?[0-9]+\.[0-9]+/ => :float,
-            /\A-?[0-9]+/ => :number,
-            /\A(\+|-)/ => :l1op,
-            /\A(\/|\*|%)/ => :l2op,
-            /\A(<|>|<=|>=|==|!=)/ => :l1op,
+            /\A(<|>|<=|>=|==|!=)/ => :op,
             /\A(\+|-|\*|\/|%)?=/ => :eq,
+            /\A(\+|-|\*|\/|%)/ => :op,
+            /\A-?[0-9]+/ => :number,
+            /\A-?[0-9]+\.[0-9]+/ => :float,
             /\A"([^"]|\\")*"/ => :string,
             /\Anil/ => :nil,
             /\A\(/ => :lpar,
@@ -99,14 +97,6 @@ module Parser
             end
         end
 
-        def self.parse_bool(tokens)
-            if self.expect tokens, :bool
-                [ (Node.new :bool, tokens[0][0], []), 1 ]
-            else
-                nil
-            end
-        end
-
         def self.parse_float(tokens)
             if self.expect tokens, :float
                 [ (Node.new :float, tokens[0][0], []), 1 ]
@@ -199,7 +189,7 @@ module Parser
         end
 
         def self.parse_literal(tokens)
-            (self.parse_block tokens) || (self.parse_bool 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)
+            (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)
@@ -360,7 +350,7 @@ module Parser
             return [ (Node.new :for, e, [name, block]), total ]
         end
 
-        def self.parse_term(tokens)
+        def self.parse_op(tokens)
             total = 0
             unless self.parse_literal tokens
                 return nil
@@ -368,38 +358,16 @@ module Parser
             lhs, part = self.parse_literal tokens
             total += part
             tokens = tokens[part..tokens.size]
-            unless self.expect tokens, :l2op
-                return [lhs, part]
-            end
-            op = tokens[0][0]
-            total += 1
-            tokens = tokens[1..tokens.size]
-            unless self.parse_literal tokens
-                return nil
-            end
-            rhs, part = self.parse_literal tokens
-            total += part
-            return [ (Node.new :op, op, [lhs, rhs]), total]
-        end
-
-        def self.parse_op(tokens)
-            total = 0
-            unless self.parse_term tokens
+            unless self.expect tokens, :op
                 return nil
             end
-            lhs, part = self.parse_term tokens
-            total += part
-            tokens = tokens[part..tokens.size]
-            unless self.expect tokens, :l1op
-                return [lhs, part]
-            end
             op = tokens[0][0]
             total += 1
             tokens = tokens[1..tokens.size]
-            unless self.parse_term tokens
+            unless self.parse_expr tokens
                 return nil
             end
-            rhs, part = self.parse_term tokens
+            rhs, part = self.parse_expr tokens
             total += part
             return [ (Node.new :op, op, [lhs, rhs]), total]
         end
@@ -535,7 +503,7 @@ module Parser
         end
             
         def self.parse_expr(tokens)
-            (self.parse_require tokens) || (self.parse_new tokens) || (self.parse_object tokens) || (self.parse_fn tokens) || (self.parse_assign tokens) || (self.parse_op tokens)  || (self.parse_term tokens) || (self.parse_call tokens) || (self.parse_literal tokens) || (self.parse_if tokens) || (self.parse_while tokens) || (self.parse_for tokens)
+            (self.parse_require tokens) || (self.parse_new tokens) || (self.parse_object tokens) || (self.parse_fn tokens) || (self.parse_assign tokens) || (self.parse_op tokens)  || (self.parse_call tokens) || (self.parse_literal tokens) || (self.parse_if tokens) || (self.parse_while tokens) || (self.parse_for tokens)
         end
 
         def self.parse(tokens, path)

data/lib/sdx/vm/datatypes.rb

@@ -341,9 +341,8 @@ class Nil < DataType
 end
 
 class List < DataType
-    def initialize(val, scope=nil)
+    def initialize(val)
         @internal = val
-        @scope = scope
         @pos = 0
         @fields = {
             "__as_string" => (NativeFnInternal.new (Proc.new do 
@@ -412,7 +411,7 @@ class List < DataType
     end
     
     def add(other)
-        return List.new [*@internal, (Variable.new other, (get_type other), @scope || @internal[0].scope)]
+        return List.new [*@internal, (Variable.new other, (get_type other), @internal[0].scope)]
     end
 
     def mul(other)

data/lib/sdx/vm/vm.rb

@@ -18,14 +18,10 @@ class VM
     attr_accessor :bc_io
     
     def truthy(val)
-        case val.value
-        when Bool
-            return val.value.internal
-        end
         if val.value.fields["__as_bool"]
-            return (val.value.fields["__as_bool"].call).internal
+            (val.value.fields["__as_bool"].call).internal
         else
-            return true
+            true
         end
     end
 
@@ -59,7 +55,7 @@ class VM
         when String
             to_var (Str.new val)
         when Float
-            to_var (Num.new val)
+            to_var (Float.new val)
         when Array
             to_var (List.new val.map { |v| from_rb v })
         when Nil
@@ -279,19 +275,12 @@ class VM
                         vals << pop_from_stack
                     end
                     vals.reverse!
-                    push_to_stack Variable.new (List.new vals, @global), :list, @global
+                    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 :bool
-                    val = get_string
-                    t = {
-                        "true" => true,
-                        "false" => false,
-                    }
-                    push_to_stack Variable.new (Bool.new t[val]), :bool, @global
                 when :nil
                     push_to_stack Variable.new (Nil.new), :nil, @global
                 end

metadata

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