yadriggy 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5af1fba63b8de51cbdd01aec66b557292134c43f
-  data.tar.gz: f797ce20c6a020eac1cd3ecc7de7cdc6567ccd13
+SHA256:
+  metadata.gz: 965a6bb4be2daef3f40ee7c19460bc96cc991f0a6e438c5dbf60f4b725ab6950
+  data.tar.gz: 10bc72c4deaec889fc53da6f6d0e91acf0c23f77b4dc58af06587d5574720a32
 SHA512:
-  metadata.gz: e91097275404a17c9c6e98c1ee0b4ae58c4c21a13562baae2fdad877d0d9905dc53878a99d754ba729465d2e8716d925ef1191ce836419307ea85c2c91f25605
-  data.tar.gz: 8a6e29162f1f420ec5598ffed5de0a179cc45f3cf9639570d08d281566bff2bf21d176730b5767bb19f0d4a10012825eda4e6044dc86626da47e5f95cef0e857
+  metadata.gz: 42d1f8b97ec8384892b667921a09bee0a4abbb1d90c2bacd426a1386bb68e986061b950b3ff151065064fbc9230554b564f9ba7a08afd165a19d790670664118
+  data.tar.gz: 6d2aa2b2c56d28da350eaec79535b2c03d843362904d7cdf1da7264d2cd22a411f5f706945414a889eeaed70c1ef8e096364f06b59e9d1c3a845cddd24e09558

data/lib/yadriggy/ast.rb

@@ -257,7 +257,7 @@ module Yadriggy
     attr_reader :column
 
     def self.tags()
-      [:@int, :@float]
+      [:@int, :@float, :@rational, :@imaginary]
     end
 
     def initialize(sexp)
@@ -270,8 +270,12 @@ module Yadriggy
                  end
                when :@float
                  sexp[1].to_f
+               when :@rational
+                 sexp[1].to_r
+               when :@imaginary
+                 Complex(sexp[1])
                else
-                 raise "unknown symbol " + sexp[0]
+                 raise "unknown symbol #{sexp[0]}"
                end
       @line_no = sexp[2][0].to_i
       @column = sexp[2][1].to_i
@@ -300,11 +304,11 @@ module Yadriggy
     end
 
     # @param [Array] s  an S-expression.
-    # @param [Symbol] tag
+    # @param [Array<Symbol>] tags
     # @return [Array] the S-expression if it starts with the tag.
     #   Otherwise, raise an error.
-    def has_tag?(s, tag)
-      raise "s-exp is not :#{tag.to_s}. #{s}" if !s.nil? && s[0] != tag
+    def has_tag?(s, *tags)
+      raise "s-exp is not :#{tags.join(", ")}. #{s}" if !s.nil? && !tags.include?(s[0])
       s
     end
   end
@@ -916,7 +920,7 @@ module Yadriggy
       @name = if sexp[3] == :call
                 nil
               else
-                @name = to_node(has_tag?(sexp[3], :@ident))
+                @name = to_node(has_tag?(sexp[3], :@ident, :@const))
               end
       add_child(@receiver)
       add_child(@name)
@@ -1596,7 +1600,7 @@ module Yadriggy
       @name = if def_name[0] == :@op
                 to_node(def_name)
               else
-                to_node(has_tag?(def_name, :@ident))
+                to_node(has_tag?(def_name, :@ident, :@const))
               end
       add_child(@name)
 

data/lib/yadriggy/ruby_typeinfer.rb

@@ -238,8 +238,12 @@ module Yadriggy
         end
       when :**, :*, :/, :%, :+, :-
         if left_t <= RubyClass::Numeric
-          if left_t <= RubyClass::Float || right_t <= RubyClass::Float
+          if left_t <= RubyClass::Complex || right_t <= RubyClass::Complex
+            return RubyClass::Complex
+          elsif left_t <= RubyClass::Float || right_t <= RubyClass::Float
             return RubyClass::Float
+          elsif left_t <= RubyClass::Rational || right_t <= RubyClass::Rational
+            return RubyClass::Rational
           else
             return RubyClass::Integer
           end

data/lib/yadriggy/syntax.rb

@@ -514,7 +514,7 @@ module Yadriggy
                        block_param: (Identifier) }
         Block      <= Parameters + { body: exprs }
         Lambda     <= Block
-        Call       <= { receiver: (expr), op: (Symbol), name: (Identifier),
+        Call       <= { receiver: (expr), op: (Symbol), name: (Identifier | Const),
                         args: [ expr ], block_arg: (expr), block: (Block) }
         Command    <= Call
         Exprs      <= { expressions: [ expr ] }
@@ -524,7 +524,7 @@ module Yadriggy
                         else: (exprs), ensure: (exprs) }
         BeginEnd   <= { body: exprs, rescue: (Rescue) }
         Def        <= Parameters +
-                      { singular: (expr), name: Identifier, body: exprs,
+                      { singular: (expr), name: (Identifier | Const), body: exprs,
                         rescue: (Rescue) }
         ModuleDef  <= { name: Const | ConstPathRef, body: exprs,
                         rescue: (Rescue) }

data/lib/yadriggy/type.rb

@@ -381,6 +381,8 @@ module Yadriggy
   RubyClass::String = RubyClass.make(String)
   RubyClass::Integer = RubyClass.make(Integer)
   RubyClass::Float = RubyClass.make(Float)
+  RubyClass::Rational = RubyClass.make(Rational)
+  RubyClass::Complex = RubyClass.make(Complex)
   RubyClass::Range = RubyClass.make(Range)
   RubyClass::Hash = RubyClass.make(Hash)
   RubyClass::Array = RubyClass.make(Array)
@@ -621,10 +623,21 @@ module Yadriggy
     # Obtains the name of this type.
     # @return [String] the type name.
     def name
-      name = @ruby_class.name
+      name = @ruby_class.name.dup
       name << '<' << @args.map{|e| e.name }.join(',') << '>'
       name
     end
+
+    # @api private
+    # Gets a method with the given name declared in this type.
+    # `nil` is returned when the method is not exactly determined.
+    #
+    # @return [Method|nil]
+    def get_method_object(method_name)
+      exact_type.instance_method(method_name)
+    rescue NameError
+      Type.error_found!("no such method: #{@ruby_class}\##{method_name}")
+    end
   end
 
   # A role that can be attached to a {Type} object.

data/lib/yadriggy/version.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2017- Shigeru Chiba.  All rights reserved.
 
 module Yadriggy
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/yadriggy.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pry"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "yard"
   # spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "test-unit", "~> 3.2.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yadriggy
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Shigeru Chiba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-26 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pycall
@@ -70,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -176,8 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.3.11
 signing_key: 
 specification_version: 4
 summary: library for building a DSL embedded in Ruby.