201 Commits

Author SHA1 Message Date
Andrew Gallant
76343f8cd6 regex: ban (?-u:\B) for Unicode regexes
The issue with the ASCII version of \B is that it can match between code
units of UTF-8, which means it can cause match indices reported to be on
invalid UTF-8 boundaries. Therefore, similar to things like `(?-u:\xFF)`,
we ban negated ASCII word boundaries from Unicode regular expressions.
Normal ASCII word boundaries remain accessible from Unicode regular
expressions.

See #457
2018-05-01 16:48:46 -04:00
Andrew Gallant
9604cc07ed unicode: remove implementations of encode_utf8
This commit removes our explicit implementations of encode_utf8 and
replaces them with uses of `char::encode_utf8`, which was added to the
standard library in Rust 1.15.
2018-05-01 16:48:46 -04:00
Andrew Gallant
05ab8f318d *: switch from try! to ? 2018-05-01 16:48:46 -04:00
Andrew Gallant
92e7baf584
regex-syntax 0.5.6 2018-05-01 13:28:53 -04:00
Andrew Gallant
17764ffe17
syntax: fix handling of (?flags) in parser
This commit fixes a bug with the handling of `(?flags)` sub-expressions
in the parser. Previously, the parser read `(?flags)`, added it to the
current concatenation, and then treat that as a valid sub-expression for
repetition operators, as in `(?i)*`. This in turn caused the translator
to panic on a failed assumption: that witnessing a repetition operator
necessarily implies a preceding sub-expression. But `(?i)` has no
explicit represents in the HIR, so there is no sub-expression.

There are two legitimate ways to fix this:

1. Ban such constructions in the parser.
2. Remove the assumption in the translator, and/or always translate a
   `(?i)` into an empty sub-expression, which should generally be a
   no-op.

This commit chooses (1) because it is more conservative. That is, it
turns a panic into an error, which gives us flexibility in the future to
choose (2) if necessary.

Fixes #465
2018-04-28 12:02:39 -04:00
Andrew Gallant
d5e5da68e2
syntax: fix 'C' alias bug
This re-generates the Unicode table for property name aliases after fixing
a bug in property name canonicalization. Namely, the 'isc' alias of the
'ISO_Comment' property was being canonicalized to 'c', which is actually
an alias of the 'Other' general category. This is a result of the
canonicalization procedure ignoring 'is' prefixes, as permitted by UTS#18.

Fixes #466
2018-04-28 10:44:41 -04:00
Andrew Gallant
f7ea409880
syntax: better error messages for '[\d-a]'
This commit adds a new type of error message that is used whenever a
character class escape sequence is used as the start or end of a
character class range.

Fixes #461
2018-04-28 09:50:25 -04:00
Andrew Gallant
15a68c8856
regex-syntax 0.5.5 2018-04-14 16:44:01 -04:00
Andrew Gallant
9ba9a758c2
syntax: fix bug in error printer
This fixes an off-by-one bug in the error formatter. Namely, if a regex
ends with a literal `\n` *and* an error is reported that contains a span
at the end of the regex, then this trips a bug in the formatter because
its line count ends up being wrong. We fix this by tweaking the line
count. The actual error message is still a little wonky, but given the
literal `\n`, it's hard not to make it wonky.

Fixes #464
2018-04-14 16:35:02 -04:00
Andrew Gallant
dba7f3b041
regex-syntax-0.5.3 2018-03-13 21:44:49 -04:00
Andrew Gallant
97651fb604 syntax/hir: add a printer for HIR
This adds a printer for the high-level intermediate representation. The
regex it prints is valid, and can be used as a way to turn it into a
regex::Regex.
2018-03-13 21:44:08 -04:00
Andrew Gallant
c230e59468 syntax/hir: fix handling of ASCII word boundaries
Previously, we had some inconsistencies in how we were handling ASCII
word boundaries. In particular, the translator was accepting a negated
ASCII word boundary even if the caller didn't disable the UTF-8 invariant.
This is wrong, since a negated ASCII word boundary can match between any
two arbitrary bytes. However, fixing this is a breaking change, so for
now we document the bug. We plan to fix it with regex 1.0. See #457.

Additionally, we were incorrectly declaring that an ASCII word boundary
matched invalid UTF-8 via the Hir::is_always_utf8 property. An ASCII word
boundary must always match an ASCII byte on one side, which implies a
valid UTF-8 position.
2018-03-13 21:44:08 -04:00
Andrew Gallant
c7c7a43827 style: reword ast::print docs
Also, small formatting fix and removal of debugging test.
2018-03-13 21:44:08 -04:00
Andrew Gallant
a3c0510711
regex-syntax-0.5.2 2018-03-12 09:49:20 -04:00
Andrew Gallant
102458feff
syntax: fix trailing - bug
This fixes a bug in the parser where a regex like `(?x)[ / - ]` would
fail to parse. In particular, since whitespace insensitive mode is
enabled, this regex should be equivalent to `[/-]`, where the `-` is
treated as a literal `-` instead of a range since it is the last
character in the class. However, the parser did not account for
whitespace insensitive mode, so it didn't see the `-` in `(?x)[ / - ]`
as trailing, and therefore reported an unclosed character class (since
the `]` was treated as part of the range).

We fix that in this commit by accounting for whitespace insensitive
mode, which we do by adding a `peek` method that skips over whitespace.

Fixes #455
2018-03-12 09:27:02 -04:00
Andrew Gallant
8b374ed3e7
regex-syntax-0.5.1 2018-03-12 08:19:06 -04:00
Andrew Gallant
a89220dd71
regex-syntax: fix nest limit checker
This commit fixes an embarrassing bug where the depth in the nest limit
checker was never decremented during postorder traversal, which means
long but shallow regexes would incorrectly trip the nest limit. We fix
that in this commit and add two regression tests.

Fixes #454
2018-03-09 22:45:55 -05:00
Andrew Gallant
b3e5fd2dde regex: remove old regex-syntax crate
This commit does the mechanical changes necessary to remove the old
regex-syntax crate and replace it with the rewrite. The rewrite now
subsumes the `regex-syntax` crate name, and gets a semver bump to 0.5.0.
2018-03-07 19:01:24 -05:00
Andrew Gallant
715a807289 syntax: rewrite the regex-syntax crate
This commit represents a ground up rewrite of the regex-syntax crate.
This commit is also an intermediate state. That is, it adds a new
regex-syntax-2 crate without making any serious changes to any other
code. Subsequent commits will cover the integration of the rewrite and
the removal of the old crate.

The rewrite is intended to be the first phase in an effort to overhaul
the entire regex crate. To that end, this rewrite takes steps in that
direction:

* The principle change in the public API is an explicit split between a
  regular expression's abstract syntax (AST) and a high-level
  intermediate representation (HIR) that is easier to analyze. The old
  version of this crate mixes these two concepts, but leaned heavily
  towards an HIR. The AST in the rewrite has a much closer
  correspondence with the concrete syntax than the old `Expr` type does.
  The new HIR embraces its role; all flags are now compiled away
  (including the `i` flag), which will simplify subsequent passes,
  including literal detection and the compiler. ASTs are produced by
  ast::parse and HIR is produced by hir::translate. A top-level parser
  is provided that combines these so that callers can skip straight from
  concrete syntax to HIR.
* Error messages are vastly improved thanks to the span information that
  is now embedded in the AST. In addition to better formatting, error
  messages now also include helpful hints when trying to use features
  that aren't supported (like backreferences and look-around). In
  particular, octal support is now an opt-in option. (Octal support
  will continue to be enabled in regex proper to support backwards
  compatibility, but will be disabled in 1.0.)
* More robust support for Unicode Level 1 as described in UTS#18.
  In particular, we now fully support Unicode character classes
  including set notation (difference, intersection, symmetric
  difference) and correct support for named general categories, scripts,
  script extensions and age. That is, `\p{scx:Hira}` and `p{age:3.0}`
  now work. To make this work, we introduce an internal interval set
  data structure.
* With the exception of literal extraction (which will be overhauled in
  a later phase), all code in the rewrite uses constant stack space,
  even while performing analysis that requires structural induction over
  the AST or HIR. This is done by pushing the call stack onto the heap,
  and is abstracted by the `ast::Visitor` and `hir::Visitor` traits.
  The point of this method is to eliminate stack overflows in the
  general case.
* Empty sub-expressions are now properly supported. Expressions like
  `()`, `|`, `a|` and `b|()+` are now valid syntax.

The principle downsides of these changes are parse time and binary size.
Both seemed to have increased (slower and bigger) by about 1.5x. Parse
time is generally peanuts compared to the compiler, so we mostly don't
care about that. Binary size is mildly unfortunate, and if it becomes a
serious issue, it should be possible to introduce a feature that
disables some level of Unicode support and/or work on compressing the
Unicode tables. Compile times have increased slightly, but are still a
very small fraction of the overall time it takes to compile `regex`.

Fixes #174, Fixes #424
2018-03-07 19:01:24 -05:00
Bobby Holley
608c191518 syntax: decrease binary size
Avoid depending on expression Debug stringifier in release builds.

The code weighs over a kilobyte, which doesn't seem worth it for an unreachable.
2018-01-26 17:31:45 -05:00
Wim
9aec6ecad2 license: include license files in sub-crates
Fixes #342
2018-01-17 16:09:35 -05:00
Andrew Gallant
fa5cf6b86e
regex-syntax-0.4.2 2017-12-30 15:38:50 -05:00
Andrew Gallant
65c4f8ee1f docs: link to docs.rs 2017-12-30 15:37:41 -05:00
Andrew Gallant
2f1e5b0e10 deps: setup workspace
There are a few sub-crates in this repository, so sharing a target
directory makes sense.
2017-12-30 15:37:41 -05:00
Andrew Gallant
55223a5269 deps: update quickcheck and rand to latest versions
These are dev dependencies, so we don't need to worry about the minimum
Rust version supported.
2017-12-30 15:37:41 -05:00
Josh Stone
f2ced64455 bump quickcheck to 0.5
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2017-11-30 23:06:35 +01:00
Prearo, Andrea
ba5a3df264 Remove sub-expressions for InvalidClassEscape 2017-09-27 09:14:48 -07:00
Prearo, Andrea
d756cd6e90 Fix unused variable warning 2017-09-27 09:14:45 -07:00
Prearo, Andrea
c8471c4041 Remove sub-expressions from parsing error 2017-09-27 09:14:40 -07:00
Josh Stone
a852378de0 regex-syntax: update to Unicode 10.0 2017-09-07 10:36:51 -07:00
David Fifield
83762bdde2 Remove stray newline from fmt::Display for MissingBase10.
Introduced in 45ad9237.
2017-05-31 18:17:03 -07:00
Andrew Gallant
28174bac90
release 0.2.2 2017-05-21 11:43:46 -04:00
Robin Stocker
bb233ecb5d Support nested character classes and intersection with &&
This implements parts of UTS#18 RL1.3, namely:

* Nested character classes, e.g.: `[a[b-c]]`
* Intersections in classes, e.g.: `[\w&&\p{Greek}]`

They can be combined to do things like `[\w&&[^a]]` to get all word
characters except `a`.

Fixes #341
2017-05-21 21:30:15 +10:00
Robin Stocker
6f32d2f683 Fix panics with whitespace in extended mode by being more strict
Instead of ignoring space in all the bump/peek methods (as proposed in
pull request #349), have an explicit `ignore_space` method that can be
used in places where space/comments should be allowed.

This makes parsing a bit stricter than before as well.
2017-04-07 19:06:43 +10:00
Andrew Gallant
d894c631cb Fix a bug in literal extraction.
When doing literal extraction, a non-empty concatenation should always be
cut when a `^` (for prefixes) or a `$` (for suffixes) is seen. If a counted
repetition is used, e.g., `${2}`, then the cut detection fails. We add in
a special case to handle it.

Fixes #321
2017-02-17 21:39:29 -05:00
Robin Stocker
de011eaa09 Fix typo in comment (UTC -> UTS) 2017-02-16 15:19:08 +11:00
Andrew Gallant
c7bc06f8d4 Reorganize CI testing.
Writing all of the testing scripts inside the .travis.yml file was
becoming painful, and parts of it were wrong by allowing for some
commands to fail without failing the entire build.

This also fixes the Github token (again).
2017-01-02 16:50:48 -05:00
Andrew Gallant
ac3ab6d21b Bump versions everywhere and update CHANGELOG.
Fixes #296, Fixes #307
2016-12-31 17:01:54 -05:00
Andrew Gallant
f094d15678 Update github links. 2016-12-31 16:49:30 -05:00
Andrew Gallant
dd120a963a Require escaping of [, &, - and ~ in classes.
The escaping of &, - and ~ is only required when the characters are
repeated adjacently, which should be quite rare. Escaping of [ is always
required, unless it appear in the second position of a range.

These rules enable us to add character class sets as described in
UTS#18 RL1.3 in a backward compatible way.
2016-12-30 01:06:18 -05:00
Andrew Gallant
bc06024c7f Make ASCII classes consistent with other engines.
For example, the regex `[:upper:]` used to correspond to the `upper`
ASCII character class, but it now corresponds to the character class
containing the characters `:upper:`.

Forms like `[[:upper:][:blank:]]` are still accepted.

Fixes #175
2016-12-30 01:06:18 -05:00
Aaronepower
8ee9262124 Changed the name of quote to escape. 2016-12-30 01:06:18 -05:00
Andrew Gallant
524ba8e6ad Add a test case for fix #304. 2016-12-28 19:38:50 -05:00
Scott Steele
b96e5cb899 Verify character class still non-empty after converting to byte class
For `[^\x00-\xff]`, while it is still treated as a full Unicode
character class, it is not empty. For instance `≥` would still be
matched.

However, when `CharClass::to_byte_class` is called on it (as is done
when using `regex::bytes::Regex::new` rather than `regex::Regex::new`),
it _is_ now empty, since it excludes all possible bytes.

This commit adds a test asserting that `regex::bytes::Regex::new`
returns `Err` for this case (in accordance with
https://github.com/rust-lang-nursery/regex/issues/106) and adds an
`is_empty` check to the result of calling `CharClass::to_byte_class`,
which allows the test to pass.
2016-12-07 21:20:08 -05:00
Andrew Gallant
54ae5b6b42 remove codegen-units 2016-12-06 17:35:44 -05:00
Matt DeBoard
45ad9237b6 Fix typo in error messages. 2016-11-17 21:25:59 -06:00
Andrew Gallant
4ff10d58db regex-syntax-0.3.9 2016-10-27 18:01:32 -04:00
Andrew Gallant
0471c74929 Fixes a bug introduced by the fix in 630049.
This is another variant of incorrectly producing an unambiguous set of
literals.

Fixes #291.
2016-10-27 17:36:12 -04:00
Andrew Gallant
06f952b9ac regex-syntax-0.3.8 2016-10-26 18:31:33 -04:00
Andrew Gallant
220c076b7a Add another regression test. 2016-10-26 18:31:04 -04:00