sardonyx 0.1.83 → 0.1.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc308366fad5b10c92dec85090d721e7e609d461aec60e7cf8f319a5a542a0e
-  data.tar.gz: 033f7e434ffae2192f194ef1a7933c52f400be53ef4bdeb9b7719afecd56dfbb
+  metadata.gz: f381674f5e870ec9ac7fe8f9ce699b1e851c7314ad9480201710bcd32e665185
+  data.tar.gz: c42b1e66d327aa8bc0e39075c3778bd3b40beb7c82d47edce91a601418a82408
 SHA512:
-  metadata.gz: 5ecf245af7c547d02cefe94b2d2bd0279051e14977c4f4b4e5ee2c156fce6cd3f3407fb2474dca295fdaf6d08704bd3065ff28624700dccd40c0b679b89bd05c
-  data.tar.gz: 2575dc2a542a141742645687f0c4bb0e93995760d621295be3b6fbd9907159221627c6ae622b33ec14db57f4335b1e0b8022578e8c71c241b7986919ffacbff3
+  metadata.gz: 43c77a34a4edf0b6a87af9183004a57d8cb285f115159240b5798c8ce37723e2f9018c5f5a630d2f7c102cbf50a42f181eee30685f74cf2ede839f1e5a224a72
+  data.tar.gz: 83d259340d9dec63f6696de3a3d76832bc7c98880634df1139f5cd89042d7c7eb5c8cad1d27062fa027174344583a593d37698c96aac19328c7965b047d4ea34

data/lib/sdx/compiler/parser.rb

@@ -113,6 +113,23 @@ module Parser
             end
         end
 
+        def self.parse_parens(tokens)
+            if self.expect tokens, :lpar
+                tokens = tokens[1..tokens.size]
+                unless self.parse_expr tokens
+                    return nil
+                end
+                e, part = self.parse_expr tokens
+                tokens = tokens[part..tokens.size]
+                unless self.expect tokens, :rpar
+                    return nil
+                end
+                return [e, part + 2]
+            else
+                return nil
+            end
+        end
+
         def self.parse_list(tokens)
             unless (self.expect tokens, :lbrack)
                 return nil
@@ -155,7 +172,7 @@ module Parser
             while true
                 if self.expect tokens, :rbrace
                     total += 1
-                    break
+                    return [ (Node.new :block, "", children), total ]
                 end
                 e = self.parse_expr tokens
                 if e
@@ -167,23 +184,26 @@ module Parser
                     Kernel.exit 1
                 end
             end
+            total += 1
             [ (Node.new :block, "", children), total ]
         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_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)
-            if self.lookahead tokens, :lpar, 1
-                unless (self.parse_literal tokens)
-                    return nil
-                end
-                callee = (self.parse_literal tokens)
-                callee = callee[0]
+            unless (self.parse_literal tokens)
+                return nil
+            end
+            callee = (self.parse_literal tokens)
+            total = callee[1]
+            tokens = tokens[total..tokens.size]
+            callee = callee[0]
+            if self.expect tokens, :lpar
                 args = []
-                tokens = tokens[2..tokens.size]
-                total = 2
+                tokens = tokens[1..tokens.size]
+                total += 1
                 if self.expect tokens, :rpar
                     return [ (Node.new :call, callee, args), total + 1 ]
                 end

data/lib/sdx/vm/vm.rb

@@ -2,6 +2,14 @@ require 'sdx/vm/variables'
 require 'sdx/vm/datatypes'
 require 'sdx/vm/scope'
 
+def codify(val)
+    if val.value.fields["__as_code_string"]
+        (val.value.fields["__as_code_string"].call).internal
+    else
+        val.value.pretty_inspect
+    end
+end
+
 class VM
     attr_accessor :bc_io
     
@@ -21,14 +29,6 @@ class VM
         end
     end
     
-    def codify(val)
-        if val.value.fields["__as_code_string"]
-            (call val.value.fields["__as_code_string"], [], val.scope).internal
-        else
-            val.value.pretty_inspect
-        end
-    end
-    
     def call(val, *args)
         if val.respond_to? :value and val.value.respond_to? :fields
             case val.value
@@ -135,6 +135,7 @@ class VM
             0x24 => :sub,
             0x25 => :mul,
             0x26 => :div,
+            0x27 => :mod,
             0x12 => :bool,
             0x13 => :int,
             0x14 => :str,

metadata

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