rupkl 0.2.0 → 0.3.0

data/lib/rupkl/node/value_common.rb

@@ -28,17 +28,13 @@ module RuPkl
         to_string(context)
       end
 
-      def copy(parent = nil)
+      def copy(parent = nil, position = @position)
         self.class.new(parent, @value, position)
       end
 
       def ==(other)
         other.instance_of?(self.class) && value == other.value
       end
-
-      def coerce(_operator, r_operand)
-        [value, r_operand.value]
-      end
     end
   end
 end

data/lib/rupkl/parser/expression.rb

@@ -41,11 +41,21 @@ module RuPkl
         ).as(:amend_expression)
       end
 
+      rule(:if_expression) do
+        (
+          kw_if.as(:kw_if) >> ws? >>
+            bracketed(expression.as(:condition), '(', ')') >> ws? >>
+              expression.as(:if_expression) >> ws >>
+            kw_else.ignore >> ws >>
+              expression.as(:else_expression)
+        ).as(:if_expression)
+      end
+
       rule(:primary) do
         [
           float_literal, int_literal, boolean_literal, string_literal,
           this_expression, null_expression, new_expression, amend_expression,
-          unqualified_member_ref, parenthesized_expression
+          if_expression, unqualified_member_ref, parenthesized_expression
         ].inject(:|)
       end
 
@@ -83,11 +93,15 @@ module RuPkl
         ) | qualified_member_ref_or_subscript_operation
       end
 
+      rule(:unary_operator) do
+        (str('-') | str('!')).as(:unary_operator)
+      end
+
       rule(:unary_operation) do
         (
-          (str(:-) | str(:!)).as(:unary_operator) >>
-            ws? >> non_null_operation.as(:operand)
-        ) | non_null_operation
+          (unary_operator >> ws?).repeat(1).as(:operators) >>
+            non_null_operation.as(:operand)
+        ).as(:unary_operation) | non_null_operation
       end
 
       rule(:binary_operation) do
@@ -213,12 +227,35 @@ module RuPkl
         Node::AmendExpression.new(nil, t, Array(b), t.position)
       end
 
+      rule(
+        if_expression:
+          {
+            kw_if: simple(:kw), condition: simple(:condition),
+            if_expression: simple(:if_expression),
+            else_expression: simple(:else_expression)
+          }
+      ) do
+        Node::IfExpression.new(
+          nil, condition, if_expression, else_expression, node_position(kw)
+        )
+      end
+
       rule(operand: simple(:operand), non_null_operator: simple(:operator)) do
         Node::NonNullOperation.new(nil, operator.to_sym, operand, operand.position)
       end
 
-      rule(unary_operator: simple(:operator), operand: simple(:operand)) do
-        Node::UnaryOperation.new(nil, operator.to_sym, operand, node_position(operator))
+      rule(unary_operator: simple(:op)) do
+        op
+      end
+
+      rule(
+        unary_operation: {
+          operators: sequence(:operators), operand: simple(:operand)
+        }
+      ) do
+        operators.reverse.inject(operand) do |result, operator|
+          Node::UnaryOperation.new(nil, operator.to_sym, result, node_position(operator))
+        end
       end
 
       rule(

data/lib/rupkl/parser/misc.rb

@@ -50,5 +50,25 @@ module RuPkl
         atom >> (ws? >> str(delimiter).ignore >> ws? >> atom).repeat
       end
     end
+
+    define_parser do
+      rule(:modifier) do
+        kw_local.as(:modifier)
+      end
+
+      rule(:modifiers) do
+        (modifier >> ws).repeat(1).as(:modifiers)
+      end
+    end
+
+    define_transform do
+      rule(modifier: simple(:modifier)) do
+        modifier.to_sym
+      end
+
+      rule(modifiers: sequence(:modifiers)) do
+        modifiers.to_h { |m| [m.to_sym, true] }
+      end
+    end
   end
 end

data/lib/rupkl/parser/object.rb

@@ -8,15 +8,19 @@ module RuPkl
       end
 
       rule(:object_body) do
-        members = object_member >> (ws >> object_member).repeat
         bracketed(
-          members.as(:members).maybe,
+          object_items.as(:items).maybe,
           str('{').as(:body_begin), '}'
         ).as(:object_body)
       end
 
-      rule(:object_member) do
+      rule(:object_items) do
+        object_item >> (ws >> object_item).repeat
+      end
+
+      rule(:object_item) do
         [
+          when_generator, for_generator,
           object_method, object_element,
           object_property, object_entry
         ].inject(:|)
@@ -24,10 +28,8 @@ module RuPkl
 
       rule(:object_property) do
         (
-          id.as(:name) >> ws? >>
-            (
-              (str('=').ignore >> ws? >> expression) | object
-            ).as(:value)
+          modifiers.as(:modifiers).maybe >> id.as(:name) >> ws? >>
+            ((str('=').ignore >> ws? >> expression) | object).as(:value)
         ).as(:object_property)
       end
 
@@ -42,7 +44,7 @@ module RuPkl
 
       rule(:object_element) do
         (
-          expression >> (ws? >> match('[={]')).absent?
+          modifiers.absent? >> expression >> (ws? >> match('[={]')).absent?
         ).as(:object_element)
       end
 
@@ -52,6 +54,25 @@ module RuPkl
           str('=').ignore >> ws? >> expression.as(:body)
         ).as(:object_method)
       end
+
+      rule(:when_generator) do
+        (
+          kw_when.as(:kw_when) >> ws? >>
+          bracketed(expression.as(:condition), '(', ')') >> ws? >>
+          object_body.as(:when_body) >>
+          (ws? >> kw_else.ignore >> ws? >> object_body.as(:else_body)).maybe
+        ).as(:when_generator)
+      end
+
+      rule(:for_generator) do
+        (
+          header =
+            (id.as(:key_name) >> ws? >> str(',') >> ws?).maybe >>
+            id.as(:value_name) >> ws >> kw_in >> ws >> expression.as(:iterable)
+          kw_for.as(:kw_for) >> ws? >>
+            bracketed(header, '(', ')') >> ws? >> object_body.as(:body)
+        ).as(:for_generator)
+      end
     end
 
     define_transform do
@@ -60,16 +81,29 @@ module RuPkl
         Node::UnresolvedObject.new(nil, nil, bodies, bodies.first.position)
       end
 
-      rule(object_body: { body_begin: simple(:b) }) do
-        Node::ObjectBody.new(nil, nil, node_position(b))
+      rule(object_body: { body_begin: simple(:body_begin) }) do
+        Node::ObjectBody.new(nil, nil, node_position(body_begin))
       end
 
-      rule(object_body: { body_begin: simple(:b), members: subtree(:m) }) do
-        Node::ObjectBody.new(nil, Array(m), node_position(b))
+      rule(
+        object_body: {
+          body_begin: simple(:body_begin), items: subtree(:items)
+        }
+      ) do
+        Node::ObjectBody.new(nil, Array(items), node_position(body_begin))
       end
 
       rule(object_property: { name: simple(:n), value: simple(:v) }) do
-        Node::ObjectProperty.new(nil, n, v, n.position)
+        Node::ObjectProperty.new(nil, n, v, nil, n.position)
+      end
+
+      rule(
+        object_property:
+          {
+            modifiers: subtree(:m), name: simple(:n), value: simple(:v)
+          }
+      ) do
+        Node::ObjectProperty.new(nil, n, v, m, n.position)
       end
 
       rule(object_entry: { key: simple(:k), value: simple(:v) }) do
@@ -99,6 +133,55 @@ module RuPkl
       ) do
         Node::MethodDefinition.new(nil, name, params, type, body, node_position(kw))
       end
+
+      rule(
+        when_generator:
+          {
+            kw_when: simple(:kw), condition: simple(:condition),
+            when_body: simple(:when_body)
+          }
+      ) do
+        Node::WhenGenerator.new(
+          nil, condition, when_body, nil, nil, node_position(kw)
+        )
+      end
+
+      rule(
+        when_generator:
+          {
+            kw_when: simple(:kw), condition: simple(:condition),
+            when_body: simple(:when_body), else_body: simple(:else_body)
+          }
+      ) do
+        Node::WhenGenerator.new(
+          nil, condition, when_body, else_body, nil, node_position(kw)
+        )
+      end
+
+      rule(
+        for_generator:
+          {
+            kw_for: simple(:kw), value_name: simple(:value_name),
+            iterable: simple(:iterable), body: simple(:body)
+          }
+      ) do
+        Node::ForGenerator.new(
+          nil, nil, value_name, iterable, body, nil, node_position(kw)
+        )
+      end
+
+      rule(
+        for_generator:
+          {
+            kw_for: simple(:kw),
+            key_name: simple(:key_name), value_name: simple(:value_name),
+            iterable: simple(:iterable), body: simple(:body)
+          }
+      ) do
+        Node::ForGenerator.new(
+          nil, key_name, value_name, iterable, body, nil, node_position(kw)
+        )
+      end
     end
   end
 end

data/lib/rupkl/parser/pkl_class.rb

@@ -5,10 +5,8 @@ module RuPkl
     define_parser do
       rule(:pkl_class_property) do
         (
-          id.as(:name) >> ws? >>
-          (
-            (str('=').ignore >> ws? >> expression) | object
-          ).as(:value)
+          modifiers.as(:modifiers).maybe >> id.as(:name) >> ws? >>
+            ((str('=').ignore >> ws? >> expression) | object).as(:value)
         ).as(:class_property)
       end
 
@@ -22,7 +20,16 @@ module RuPkl
 
     define_transform do
       rule(class_property: { name: simple(:n), value: simple(:v) }) do
-        Node::ObjectProperty.new(nil, n, v, n.position)
+        Node::ObjectProperty.new(nil, n, v, nil, n.position)
+      end
+
+      rule(
+        class_property:
+          {
+            modifiers: subtree(:m), name: simple(:n), value: simple(:v)
+          }
+      ) do
+        Node::ObjectProperty.new(nil, n, v, m, n.position)
       end
 
       rule(

data/lib/rupkl/pkl_object.rb

@@ -4,12 +4,8 @@ module RuPkl
   class PklObject
     include Enumerable
 
-    SELF = Object.new.freeze
-
-    def initialize(properties, entries, elements)
-      @properties = replace_self_hash(properties)
-      @entries = replace_self_hash(entries)
-      @elements = replace_self_array(elements)
+    def initialize
+      @properties, @entries, @elements = yield(self)
       define_property_accessors
     end
 
@@ -96,18 +92,6 @@ module RuPkl
 
     private
 
-    def replace_self_hash(hash)
-      hash&.each do |(key, value)|
-        hash[key] = self if value.equal?(SELF)
-      end
-    end
-
-    def replace_self_array(array)
-      array&.each_with_index do |value, i|
-        array[i] = self if value.equal?(SELF)
-      end
-    end
-
     def define_property_accessors
       @properties&.each_key do |name|
         singleton_class.class_eval(<<~M, __FILE__, __LINE__ + 1)

data/lib/rupkl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RuPkl
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/rupkl.rb

@@ -7,7 +7,7 @@ require 'digest/sha2'
 require 'singleton'
 require 'stringio'
 require 'parslet'
-require 'facets/module/basename'
+require 'regexp_parser'
 
 require_relative 'rupkl/version'
 require_relative 'rupkl/exception'
@@ -25,6 +25,7 @@ require_relative 'rupkl/node/member_reference'
 require_relative 'rupkl/node/method_definition'
 require_relative 'rupkl/node/method_call'
 require_relative 'rupkl/node/amend_expression'
+require_relative 'rupkl/node/if_expression'
 require_relative 'rupkl/node/operation'
 require_relative 'rupkl/node/this'
 require_relative 'rupkl/node/any'
@@ -32,10 +33,17 @@ require_relative 'rupkl/node/null'
 require_relative 'rupkl/node/boolean'
 require_relative 'rupkl/node/number'
 require_relative 'rupkl/node/string'
-require_relative 'rupkl/node/object'
+require_relative 'rupkl/node/regex'
+require_relative 'rupkl/node/data_size'
+require_relative 'rupkl/node/duration'
+require_relative 'rupkl/node/pair'
+require_relative 'rupkl/node/collection'
+require_relative 'rupkl/node/map'
+require_relative 'rupkl/node/intseq'
 require_relative 'rupkl/node/dynamic'
 require_relative 'rupkl/node/mapping'
 require_relative 'rupkl/node/listing'
+require_relative 'rupkl/node/object'
 require_relative 'rupkl/node/pkl_module'
 require_relative 'rupkl/node/base'
 require_relative 'rupkl/parser'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rupkl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-18 00:00:00.000000000 Z
+date: 2024-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: facets
+  name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: parslet
+  name: regexp_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.9.2
 description: Pkl parser for Ruby
 email:
 - taichi730@gmail.com
@@ -68,11 +68,17 @@ files:
 - lib/rupkl/node/any.rb
 - lib/rupkl/node/base.rb
 - lib/rupkl/node/boolean.rb
+- lib/rupkl/node/collection.rb
 - lib/rupkl/node/context.rb
+- lib/rupkl/node/data_size.rb
 - lib/rupkl/node/declared_type.rb
+- lib/rupkl/node/duration.rb
 - lib/rupkl/node/dynamic.rb
 - lib/rupkl/node/identifier.rb
+- lib/rupkl/node/if_expression.rb
+- lib/rupkl/node/intseq.rb
 - lib/rupkl/node/listing.rb
+- lib/rupkl/node/map.rb
 - lib/rupkl/node/mapping.rb
 - lib/rupkl/node/member_finder.rb
 - lib/rupkl/node/member_reference.rb
@@ -83,8 +89,10 @@ files:
 - lib/rupkl/node/number.rb
 - lib/rupkl/node/object.rb
 - lib/rupkl/node/operation.rb
+- lib/rupkl/node/pair.rb
 - lib/rupkl/node/pkl_module.rb
 - lib/rupkl/node/reference_resolver.rb
+- lib/rupkl/node/regex.rb
 - lib/rupkl/node/string.rb
 - lib/rupkl/node/struct_common.rb
 - lib/rupkl/node/this.rb
@@ -124,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
 summary: Pkl parser for Ruby