yadriggy 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d83c607a05a798affb11bc37c66957e52fea134
-  data.tar.gz: b09072545e519f69744cde7b7a16c0b0fc605a7d
+  metadata.gz: 5af1fba63b8de51cbdd01aec66b557292134c43f
+  data.tar.gz: f797ce20c6a020eac1cd3ecc7de7cdc6567ccd13
 SHA512:
-  metadata.gz: 1941aeddac242432dfe7f24b99c84e2563abc94ca7b280a51761dab718ed5c43a20763ddb11a410d60d0cb95848b94c7d15c458945773866fa33e415eaf2363e
-  data.tar.gz: 73fa0d7468e8384589865f5f7535a97580f045909969e0df8fe82cee5fddfc181e8f8f5f97a5a6cd57534df950d4dab2ee2a0e65b95ff32379dc7a5ef8c8a9f6
+  metadata.gz: e91097275404a17c9c6e98c1ee0b4ae58c4c21a13562baae2fdad877d0d9905dc53878a99d754ba729465d2e8716d925ef1191ce836419307ea85c2c91f25605
+  data.tar.gz: 8a6e29162f1f420ec5598ffed5de0a179cc45f3cf9639570d08d281566bff2bf21d176730b5767bb19f0d4a10012825eda4e6044dc86626da47e5f95cef0e857

data/.gitignore

@@ -11,3 +11,5 @@
 /spec/reports/
 /testbin/
 /tmp/
+/lib/yadriggy/oops/yadriggy_oops.bundle
+/lib/yadriggy/oops/gc.hpp

data/README.md

@@ -1,6 +1,6 @@
 # Yadriggy
 
-Yadriggy (mistletoe in Japanese) is a library for building a
+Yadriggy (mistletoe in English) is a library for building a
 domain-specific language (DSL) embedded in Ruby.  It was developed for
 a particular kind of embedded DSLs.
 These DSLs borrow the syntax from the host language, Ruby, and the
@@ -91,6 +91,10 @@ The idea of `reify` was proposed in the following paper:
 
 - Shigeru Chiba, YungYu Zhuang, Maximilian Scherr, "Deeply Reifying Running Code for Constructing a Domain-Specific Language", PPPJ'16, Article No. 1, ACM, August 2016.
 
+Yadriggy-Py was presented in the following paper:
+
+- Shigeru Chiba, Foreign language interfaces by code migration, Proc. of the 18th ACM SIGPLAN International Conference on Generative Programming: Concepts and Experiences (GPCE 2019), pp. 1-13, ACM, 2019.
+
 ## Installation
 
 To install, run:

data/lib/yadriggy/ast.rb

@@ -912,7 +912,7 @@ module Yadriggy
 
     def initialize_call(sexp)
       @receiver = to_node(sexp[1])
-      @op = sexp[2]	# :"." or :"::" or nil.
+      @op = op_symbol(sexp[2])    # :"." or :"::" or nil.
       @name = if sexp[3] == :call
                 nil
               else
@@ -922,6 +922,16 @@ module Yadriggy
       add_child(@name)
     end
 
+    def op_symbol(op)
+      if op.is_a?(Array)
+        op = has_tag?(op, :@period)
+        op[1].to_sym
+      else
+        # Ruby 2.5 or earlier
+        op
+      end
+    end
+
     def initialize_args(args_block)
       args = if args_block[0] == :args_add_block
                args_block[1]
@@ -1380,7 +1390,7 @@ module Yadriggy
       if body.is_a?(Array) && body.length > 0 && body[0] == :bodystmt
         bodystmnt = body[1]
         @rescue = Rescue.make(body[2], body[3], body[4])
-      else # if Ruby 2.4 or earlier
+      else # if Ruby 2.5 or earlier
         bodystmnt = body
         @rescue = nil
       end
@@ -1488,8 +1498,14 @@ module Yadriggy
       if else_expr.nil?
         @else = nil
       else
-        elsexpr = has_tag?(else_expr, :else)
-        @else = Exprs.make(elsexpr[1])
+        if !else_expr.nil? && else_expr[0].is_a?(Array)
+          else_body = else_expr
+        else
+          # Ruby 2.4 or earlier
+          elsexpr = has_tag?(else_expr, :else)
+          else_body = else_expr[1]
+        end
+        @else = Exprs.make(else_body)
         add_child(@else)
       end
 

data/lib/yadriggy/checker.rb

@@ -36,6 +36,7 @@ module Yadriggy
       [@rules, @rule_declarators]
     end
 
+    # @api private
     private_class_method def self.init_class
       @rules = {}
       @rule_declarators = {}
@@ -56,6 +57,7 @@ module Yadriggy
       find_rule_entry2(ast.class, ast.usertype)
     end
 
+    # @api private
     private_class_method def self.find_rule_entry2(ast_class, utype)
       unless utype.nil?
         rule = @rules[utype]
@@ -147,7 +149,7 @@ module Yadriggy
     # This is the entry point of the checker.  It may also
     # check the other ASTs invoked in the given AST.
     #
-    # @param [ASTree|ASTnode] an_ast  the AST.
+    # @param [ASTree|ASTnode|nil] an_ast  the AST.
     # @return [Object]
     def check_all(an_ast)
       return nil if an_ast.nil?
@@ -162,6 +164,9 @@ module Yadriggy
     end
 
     # Makes a new base environment with the given context class.
+    # It is called by `check_all`.  Override this method to customize
+    # `check_all`.
+    #
     # @param [Module] klass  the context class.
     def make_base_env(klass)
       klass
@@ -191,7 +196,7 @@ module Yadriggy
     # internal use only
     def apply_typing_rule(rule, an_ast, ast_tenv)
       if rule.nil?
-        error_found!(an_ast, "no typing rule for #{an_ast.class}")
+        error_found!(an_ast, "no rule for #{an_ast.class}")
       else
         old_ast = @current_ast
         old_tenv = @current_env
@@ -210,7 +215,7 @@ module Yadriggy
     # Applies the rule supplied by the superclass.
     # @param [ASTnode] an_ast  an AST.
     # @param [Object] envi  an environment object.
-    # @return [Type] the type of the given AST.
+    # @return [Object] the result of the application.
     def proceed(an_ast, envi=nil)
       rule = if @rule_declarator&.superclass == Object
                nil

data/lib/yadriggy/py/codegen.rb

@@ -333,6 +333,21 @@ module Yadriggy
         print_lambda(ast.block)
       end
 
+      rule(:with_call) do
+        pairs = ast.args[0].pairs
+        # ast.args[0].pairs[0][1]
+        @printer << 'with '
+        print_each(ast.args[0].pairs, true) do |expr_var|
+          print(expr_var[0])
+          @printer << ' as '
+          print(expr_var[1])
+        end
+        @printer << ':'
+        @printer.down
+        print(ast.block.body)
+        @printer.up
+      end
+
       rule(Conditional) do
         if ast.op == :if
           @printer << ast.op << ' '

data/lib/yadriggy/py/py_typechecker.rb

@@ -1,6 +1,7 @@
 # Copyright (C) 2018- Shigeru Chiba.  All rights reserved.
 
-require 'yadriggy/py/python'
+require 'yadriggy'
+require 'yadriggy/py/syntax'
 
 module Yadriggy
   module Py

data/lib/yadriggy/py/python.rb

@@ -2,77 +2,13 @@
 
 require 'pycall'
 require 'yadriggy'
+require 'yadriggy/py/syntax'
 require 'yadriggy/py/codegen'
 require 'yadriggy/py/py_typechecker'
 require 'yadriggy/py/import'
 
 module Yadriggy
   module Py
-
-    Syntax = Yadriggy.define_syntax do
-      expr  = Name | Number | Super | Binary | Unary | ternary |
-                StringLiteral | Lambda |
-                ArrayLiteral | Paren | lambda_call | fun_call | ArrayRef | HashLiteral
-      stmnt = Return | ForLoop | Loop | if_stmnt | Break |
-                 BeginEnd | Def | ModuleDef
-      exprs = Exprs | stmnt | expr
-
-      Name = { name: String }
-      Number     = { value: Numeric }
-      VariableCall     = Name
-      InstanceVariable = nil
-      GlobalVariable   = nil
-      Reserved   = Name
-      Const      = Name
-      Binary     = { left: expr, op: Symbol, right: expr }
-      ArrayRef   = { array: expr, indexes: expr }
-      ArrayRefField  = ArrayRef
-      Assign     = { left: [expr] | expr, op: Symbol,
-                     right: [expr] | expr }
-      Dots       = Binary
-      Unary      = { op: Symbol, operand: expr }
-      StringLiteral  = { value: String }
-      ArrayLiteral   = { elements: ForLoop | [ expr ] }
-      Paren      = { expression: expr }
-      HashLiteral    = { pairs: [ (expr|Label|SymbolLiteral) * expr ] }
-      Return     = { values: [ expr ] }
-      ForLoop    = {vars: [ Identifier ], set: expr, body: exprs }
-      Loop       = { op: :while, cond: expr, body: exprs }
-      Break      = { values: nil }
-      if_stmnt   = Conditional + { op: :if, cond: expr, then: exprs,
-                      all_elsif: [expr * exprs], else: (exprs) }
-      ternary    = Conditional + { op: :ifop, cond: expr, then: expr,
-                      all_elsif: nil, else: expr }
-      Parameters = { params: [ Identifier ],
-                     optionals: [ Identifier * expr ],
-                     rest_of_params: (Identifier),
-                     params_after_rest: [ Identifier ],
-                     keywords: [ Label * expr ],
-                     rest_of_keywords: (Identifier),
-                     block_param: (Identifier) }
-      Block      = Parameters + { body: exprs }
-      Lambda     = Block + { body: expr }  # -> (x) { x + 1 }
-      lambda_name = { name: "lambda" }
-      lambda_call = Call + { receiver: nil, op: nil, name: lambda_name,
-                     args: nil, block_arg: nil, block: Block }
-      fun_call   = Call + { receiver: (expr), op: (Symbol), name: Identifier,
-                     args: [ expr ], block_arg: nil, block: nil }
-      Command    = fun_call
-      Exprs      = { expressions: [ exprs ] }
-      Rescue     = { types: [ Const | ConstPathRef ],
-                     parameter: (Identifier),
-                     body: (exprs), nested_rescue: (Rescue),
-                     else: (exprs), ensure: (exprs) }
-      BeginEnd   = { body: exprs, rescue: (Rescue) }
-      Def        = Parameters +
-                   { singular: (expr), name: Identifier, body: exprs,
-                     rescue: (Rescue) }
-      ModuleDef  = { name: Const | ConstPathRef, body: exprs,
-                     rescue: (Rescue) }
-      ClassDef   = ModuleDef +
-                   { superclass: (Const | ConstPathRef) }
-    end
-
     def self.run(&blk)
       ast = Yadriggy::reify(blk)
       Syntax.raise_error unless Syntax.check(ast.tree)

data/lib/yadriggy/py/syntax.rb

@@ -0,0 +1,75 @@
+# Copyright (C) 2018- Shigeru Chiba.  All rights reserved.
+
+require 'yadriggy'
+
+module Yadriggy
+  module Py
+    Syntax = Yadriggy.define_syntax do
+      expr  = Name | Number | Super | Binary | Unary | ternary |
+              StringLiteral | Lambda |
+              ArrayLiteral | Paren | lambda_call | with_call | fun_call |
+              ArrayRef | HashLiteral
+      stmnt = Return | ForLoop | Loop | if_stmnt | Break |
+                 BeginEnd | Def | ModuleDef
+      exprs = Exprs | stmnt | expr
+
+      Name = { name: String }
+      Number     = { value: Numeric }
+      VariableCall     = Name
+      InstanceVariable = nil
+      GlobalVariable   = nil
+      Reserved   = Name
+      Const      = Name
+      Binary     = { left: expr, op: Symbol, right: expr }
+      ArrayRef   = { array: expr, indexes: expr }
+      ArrayRefField  = ArrayRef
+      Assign     = { left: [expr] | expr, op: Symbol,
+                     right: [expr] | expr }
+      Dots       = Binary
+      Unary      = { op: Symbol, operand: expr }
+      StringLiteral  = { value: String }
+      ArrayLiteral   = { elements: ForLoop | [ expr ] }
+      Paren      = { expression: expr }
+      HashLiteral    = { pairs: [ (expr|Label|SymbolLiteral) * expr ] }
+      Return     = { values: [ expr ] }
+      ForLoop    = {vars: [ Identifier ], set: expr, body: exprs }
+      Loop       = { op: :while, cond: expr, body: exprs }
+      Break      = { values: nil }
+      if_stmnt   = Conditional + { op: :if, cond: expr, then: exprs,
+                      all_elsif: [expr * exprs], else: (exprs) }
+      ternary    = Conditional + { op: :ifop, cond: expr, then: expr,
+                      all_elsif: nil, else: expr }
+      Parameters = { params: [ Identifier ],
+                     optionals: [ Identifier * expr ],
+                     rest_of_params: (Identifier),
+                     params_after_rest: [ Identifier ],
+                     keywords: [ Label * expr ],
+                     rest_of_keywords: (Identifier),
+                     block_param: (Identifier) }
+      Block      = Parameters + { body: exprs }
+      Lambda     = Block + { body: expr }  # -> (x) { x + 1 }
+      lambda_name = { name: "lambda" }
+      lambda_call = Call + { receiver: nil, op: nil, name: lambda_name,
+                     args: nil, block_arg: nil, block: Block }
+      with_name  = { name: "with" }
+      with_call  = Call + { receiver: nil, op: nil, name: with_name,
+                            args: HashLiteral, block_arg: nil, block: Block }
+      fun_call   = Call + { receiver: (expr), op: (Symbol), name: Identifier,
+                     args: [ expr ], block_arg: nil, block: nil }
+      Command    = fun_call
+      Exprs      = { expressions: [ exprs ] }
+      Rescue     = { types: [ Const | ConstPathRef ],
+                     parameter: (Identifier),
+                     body: (exprs), nested_rescue: (Rescue),
+                     else: (exprs), ensure: (exprs) }
+      BeginEnd   = { body: exprs, rescue: (Rescue) }
+      Def        = Parameters +
+                   { singular: (expr), name: Identifier, body: exprs,
+                     rescue: (Rescue) }
+      ModuleDef  = { name: Const | ConstPathRef, body: exprs,
+                     rescue: (Rescue) }
+      ClassDef   = ModuleDef +
+                   { superclass: (Const | ConstPathRef) }
+    end
+  end
+end

data/lib/yadriggy/source_code.rb

@@ -3,10 +3,13 @@
 require 'ripper'
 require 'pry'
 
+# Interactive shell.
 class Pry
+  # Log.
   class History
-    # @api private
-    # We modify Pry::History::push to record a duplicated line as well.
+    # Records a line.
+    # We modify the original `Pry::History::push` to record a duplicated line as well.
+    # @param [String] line  an input.
     def push(line)
       unless line.empty? || line.include?("\0")
         @pusher.call(line)
@@ -22,6 +25,14 @@ class Pry
 end
 
 module Yadriggy
+  # Discards all the code given to Pry before.
+  # This should be called when the code given before includes
+  # a syntax error and hence {reify} cannot obtain an
+  # abstract syntax tree.
+  def self.reset_pry
+    SourceCode.reset_pry
+  end
+
   # @api private
   # Retrieves source code in the S-expression style.
   class SourceCode
@@ -40,11 +51,17 @@ module Yadriggy
       prog && [file_name, find_sexp(prog, line)]
     end
 
+    @pry_offset = 0
+
+    def self.reset_pry
+      @pry_offset = Pry.history.history_line_count - Pry.history.original_lines
+    end
+
     def self.read_pry_history
       cmds = Pry.commands
-      his = Pry.history.to_a[Pry.history.original_lines ...
+      his = Pry.history.to_a[Pry.history.original_lines + @pry_offset ...
                              Pry.history.history_line_count]
-      his.reduce('') do |source, line|
+      his.reduce("\n" * @pry_offset) do |source, line|
         if cmds.select {|k,v| v.matches?(line) }.empty?
           source << line << "\n"
         else

data/lib/yadriggy/typecheck.rb

@@ -160,6 +160,7 @@ module Yadriggy
     end
 
     # Gets the current type environment.
+    # @return [TypeEnv] the type enviornment.
     #
     def type_env
       @current_env
@@ -204,12 +205,17 @@ module Yadriggy
     #
     # This is an alias of check_all() but it memoizes the results.
     #
+    # @param [ASTnode|ASTree|nil] an_ast  an AST or nil.
+    # @return [Type] the type of the given AST.  It memoizes the results.
+    #
     def typecheck(an_ast)
       check_all(an_ast)
     end
 
     # Makes a new base type environment with the given context class.
     #
+    # @return [TypeEnv] the type enviornment.
+    #
     def make_base_env(klass)
       TypeEnv::BaseTypeEnv.new(klass)
     end
@@ -248,7 +254,7 @@ module Yadriggy
     #
     # @param [ASTnode|nil]  an_ast  an AST.
     # @param [Type] a_type  a type.
-    # @return [Type|nil] the given type `a_type`.
+    # @return [Type|DynType] the given type `a_type`.
     def type_as(an_ast, a_type)
       if an_ast.nil?
         DynType

data/lib/yadriggy/version.rb

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

data/yadriggy.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ffi"
   spec.add_dependency "pry"
 
-  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "yard"
   # spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yadriggy
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Shigeru Chiba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2019-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pycall
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +148,7 @@ files:
 - lib/yadriggy/py/import.rb
 - lib/yadriggy/py/py_typechecker.rb
 - lib/yadriggy/py/python.rb
+- lib/yadriggy/py/syntax.rb
 - lib/yadriggy/ruby_typecheck.rb
 - lib/yadriggy/ruby_typeinfer.rb
 - lib/yadriggy/source_code.rb