-
-
Notifications
You must be signed in to change notification settings - Fork 153
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Remove regexp body mutation support"
This reverts commit 21d3fef. This was not a clean revert. Note that: - The version of `regexp_parser` was 1.3.0, now it is 1.8.2 to accomodate our current `rubocop` version and because there were some relevant bugfixes implemented between 1.3.x and 1.8.x. We should eventually move to 2.0 but it is currently incompatible with this integration. There are some issues with the frozen Regexp classes getting mutated so we may have to open an issue. - Since "expected exception" support was removed from the specs, I have had to exclude two files entirely. This seems unfortunate as it reduces our overall coverage. - Since unsupported nodes are no longer explicitly tracked, I removed the code that used to handle that for regular expressions. See: #1021 - I had to change the example case for where we are more permissive than `regexp_parser` because `regexp_parser` has decided to become more permissive and try to match Ruby's semantics. It was actually very hard to find a case that failed--I brute-forced 50 million regexp strings that had perfect parity of being accepted and then stumbled onto the single hex escape case by accident. See: ammar/regexp_parser#75 - Changed an access pattern for regexp mutations which became equivalent based on this: https://github.com/ammar/regexp_parser/blame/4ca7cec03b210e3e00473b7b1a7308f963190c1e/lib/regexp_parser/expression/subexpression.rb#L30-L33 - Some other minor conflicts and small spec assertion changes were resolved as well.
- Loading branch information
Showing
43 changed files
with
2,132 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
# frozen_string_literal: true | ||
|
||
module Mutant | ||
module AST | ||
# Regexp source mapper | ||
module Regexp | ||
# Parse regex string into expression | ||
# | ||
# @param regexp [String] | ||
# | ||
# @return [Regexp::Expression, nil] | ||
# | ||
# rubocop:disable Lint/SuppressedException | ||
def self.parse(regexp) | ||
::Regexp::Parser.parse(regexp) | ||
# regexp_parser is more strict than MRI | ||
rescue ::Regexp::Scanner::PrematureEndError | ||
end | ||
# rubocop:enable Lint/SuppressedException | ||
|
||
# Convert expression into ast node | ||
# | ||
# @param expression [Regexp::Expression] | ||
# | ||
# @return [Parser::AST::Node] | ||
def self.to_ast(expression) | ||
ast_type = :"regexp_#{expression.token}_#{expression.type}" | ||
|
||
Transformer.lookup(ast_type).to_ast(expression) | ||
end | ||
|
||
# Convert node into expression | ||
# | ||
# @param node [Parser::AST::Node] | ||
# | ||
# @return [Regexp::Expression] | ||
def self.to_expression(node) | ||
Transformer.lookup(node.type).to_expression(node) | ||
end | ||
end # Regexp | ||
end # AST | ||
end # Mutant |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,187 @@ | ||
# frozen_string_literal: true | ||
|
||
module Mutant | ||
module AST | ||
module Regexp | ||
# Regexp bijective mapper | ||
# | ||
# Transforms parsed regular expression representation from | ||
# `Regexp::Expression` instances (provided by `regexp_parser`) into | ||
# equivalent representations using `Parser::AST::Node` | ||
class Transformer | ||
include AbstractType | ||
|
||
REGISTRY = Registry.new | ||
|
||
# Lookup transformer class for regular expression node type | ||
# | ||
# @param type [Symbol] | ||
# | ||
# @return [Class<Transformer>] | ||
def self.lookup(type) | ||
REGISTRY.lookup(type) | ||
end | ||
|
||
# Register transformer class as responsible for handling node type | ||
# | ||
# @param type [Symbol] | ||
# | ||
# @return [undefined] | ||
def self.register(type) | ||
REGISTRY.register(type, self) | ||
end | ||
private_class_method :register | ||
|
||
# Transform expression | ||
# | ||
# @param expression [Regexp::Expression] | ||
# | ||
# @return [Parser::AST::Node] | ||
def self.to_ast(expression) | ||
self::ExpressionToAST.call(expression) | ||
end | ||
|
||
# Transform node | ||
# | ||
# @param node [Parser::AST::Node] | ||
# | ||
# @return [Regexp::Expression] | ||
def self.to_expression(node) | ||
self::ASTToExpression.call(node) | ||
end | ||
|
||
# Abstract expression transformer | ||
class ExpressionToAST | ||
PREFIX = :regexp | ||
|
||
include Concord.new(:expression), Procto.call, AST::Sexp, AbstractType, Adamantium | ||
|
||
private | ||
|
||
# Node with provided children using node type constructed in `type` | ||
# | ||
# @param [Object,Parser::AST::Node] child of node | ||
# | ||
# @return [Parser::AST::Node] | ||
def ast(*children) | ||
s(type, *children) | ||
end | ||
|
||
# Wrap provided node in a quantifier | ||
# | ||
# @param node [Parser::AST::Node] | ||
# | ||
# @return [Parser::AST::Node] | ||
# quantifier node wrapping provided node if expression is quantified | ||
# | ||
# @return [Parser::AST::Node] | ||
# original node otherwise | ||
def quantify(node) | ||
return node unless expression.quantified? | ||
|
||
Quantifier.to_ast(expression.quantifier).append(node) | ||
end | ||
|
||
# Transformed children of expression | ||
# | ||
# @return [Array<Parser::AST::Node>] | ||
def children | ||
expression.map(&Regexp.public_method(:to_ast)) | ||
end | ||
|
||
# Node type constructed from token and type of `Regexp::Expression` | ||
# | ||
# @return [Symbol] | ||
def type | ||
:"#{PREFIX}_#{expression.token}_#{expression.type}" | ||
end | ||
end # ExpressionToAST | ||
|
||
# Abstract node transformer | ||
class ASTToExpression | ||
include Concord.new(:node), Procto.call, AbstractType, Adamantium | ||
|
||
# Call generic transform method and freeze result | ||
# | ||
# @return [Regexp::Expression] | ||
def call | ||
transform.freeze | ||
end | ||
|
||
private | ||
|
||
# Transformation of ast into expression | ||
# | ||
# @return [Regexp::Expression] | ||
abstract_method :transform | ||
|
||
# Transformed children of node | ||
# | ||
# @return [Array<Regexp::Expression>] | ||
def subexpressions | ||
node.children.map(&Regexp.public_method(:to_expression)) | ||
end | ||
end # ASTToExpression | ||
|
||
# Mixin for node transformers | ||
# | ||
# Helps construct a mapping from Parser::AST::Node domain to | ||
# Regexp::Expression domain | ||
module LookupTable | ||
Mapping = Class.new.include(Concord::Public.new(:token, :regexp_class)) | ||
|
||
# Table mapping ast types to object information for regexp domain | ||
class Table | ||
|
||
# Coerce array of mapping information into structured table | ||
# | ||
# @param [Array(Symbol, Array, Class<Regexp::Expression>)] | ||
# | ||
# @return [Table] | ||
def self.create(*rows) | ||
table = rows.map do |ast_type, token, klass| | ||
[ast_type, Mapping.new(::Regexp::Token.new(*token), klass)] | ||
end.to_h | ||
|
||
new(table) | ||
end | ||
|
||
include Concord.new(:table), Adamantium | ||
|
||
# Types defined by the table | ||
# | ||
# @return [Array<Symbol>] | ||
def types | ||
table.keys | ||
end | ||
|
||
# Lookup mapping information given an ast node type | ||
# | ||
# @param type [Symbol] | ||
# | ||
# @return [Mapping] | ||
def lookup(type) | ||
table.fetch(type) | ||
end | ||
end # Table | ||
|
||
private | ||
|
||
# Lookup expression token given node type | ||
# | ||
# @return [Regexp::Token] | ||
def expression_token | ||
self.class::TABLE.lookup(node.type).token | ||
end | ||
|
||
# Lookup regexp class given node type | ||
# | ||
# @return [Class<Regexp::Expression>] | ||
def expression_class | ||
self.class::TABLE.lookup(node.type).regexp_class | ||
end | ||
end # LookupTable | ||
end # Transformer | ||
end # Regexp | ||
end # AST | ||
end # Mutant |
Oops, something went wrong.