sardonyx 0.1.841 → 0.1.842

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54495fa9b457fb450d812a6a09b57a3284b948e8e93e44ab97521a241bef0a3b
-  data.tar.gz: '06619369fdff53a992b948401115f98ba11319ff0d06bd0a29d73030e39e892e'
+  metadata.gz: 03ea6caa67024a4b7f5ca9f35759e595e0895825656d561738669ffd410f7a24
+  data.tar.gz: 9c4c0459b243c717982b5426b6c88935d37af88a4acc067937a60b916b9baf66
 SHA512:
-  metadata.gz: ceb7a82b5e59a72b23063caa984e26ce4f3d9d44d41e826d1702613bdad7634f06606dd622c6751aa6f477d042a58c2191cda025bebea6aeb84c356ca9fec984
-  data.tar.gz: 71514ddd0dfe83eb7542b5686b194c396878f8d9a6da7652b7ca1f2f38cb4f6c114b31e84293df9d37d73777df4fa248a69c37170524d9c009c1d7c8de76ceb6
+  metadata.gz: b2ddef36002cf5a9804ca836d284fb17af8942257c76219425bf41fa1eded5a3ea124fe6db4977f7adc5ef5c18404b8125ed76b2158ec67f72ff839aaf0be8ab
+  data.tar.gz: 4b97a87b5241e4caa9828347962bb6eb6647cf495046470d68e8b92eb2aa9e9b57ee9438e1702fd6076271d390d6bb1748b995d5244699903666293386e654e2

data/lib/sdx/compiler/compiler.rb

@@ -103,10 +103,12 @@ module Compiler
                     end
                     i += "\x2a#{e.size}\x18"
                 end
-                bc += "\x29#{i.size}\x18" + i
+                bc += "\x2b#{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,6 +10,7 @@ module Parser
             /\Aobject/ => :object,
             /\Anew/ => :new,
             /\Arequire/ => :require,
+            /\A(true|false)/ => :bool,
             /\A(<|>|<=|>=|==|!=)/ => :op,
             /\A(\+|-|\*|\/|%)?=/ => :eq,
             /\A(\+|-|\*|\/|%)/ => :op,
@@ -97,6 +98,14 @@ 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 ]
@@ -189,7 +198,7 @@ module Parser
         end
 
         def self.parse_literal(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)
+            (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)
         end
 
         def self.parse_call(tokens)

data/lib/sdx/vm/datatypes.rb

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

data/lib/sdx/vm/vm.rb

@@ -18,10 +18,14 @@ 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"]
-            (val.value.fields["__as_bool"].call).internal
+            return (val.value.fields["__as_bool"].call).internal
         else
-            true
+            return true
         end
     end
 
@@ -275,12 +279,19 @@ class VM
                         vals << pop_from_stack
                     end
                     vals.reverse!
-                    push_to_stack Variable.new (List.new vals), :list, @global
+                    push_to_stack Variable.new (List.new vals, @global), :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.841
+  version: 0.1.842
 platform: ruby
 authors:
 - sugarfi