diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-07-13 10:42:58 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-07-13 10:42:58 -0700 |
| commit | 216e09b3ead43039f2e34a135820ef098c3be74e (patch) | |
| tree | c312a233cf3e2cf0c7ddcd679d1437a32dc819ae /test/files/run/ReplacementMatching.scala | |
| parent | 9df8f8ae9e36cf1c04929b7b0d2bdfb6fd2f360f (diff) | |
| parent | 18e3e61778918e4e802b8fb75789635409523372 (diff) | |
| download | scala-216e09b3ead43039f2e34a135820ef098c3be74e.tar.gz scala-216e09b3ead43039f2e34a135820ef098c3be74e.tar.bz2 scala-216e09b3ead43039f2e34a135820ef098c3be74e.zip | |
Merge pull request #4622 from retronym/merge/2.11.x-to-2.12.x-20150713
Merge 2.11.x to 2.12.x [ci: last-only]
Diffstat (limited to 'test/files/run/ReplacementMatching.scala')
| -rw-r--r-- | test/files/run/ReplacementMatching.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/ReplacementMatching.scala b/test/files/run/ReplacementMatching.scala index 05040d98a3..81034aa510 100644 --- a/test/files/run/ReplacementMatching.scala +++ b/test/files/run/ReplacementMatching.scala @@ -32,12 +32,12 @@ object Test { def groupsMatching { val Date = """(\d+)/(\d+)/(\d+)""".r - for (Regex.Groups(a, b, c) <- Date findFirstMatchIn "1/1/2001 marks the start of the millenium. 31/12/2000 doesn't.") { + for (Regex.Groups(a, b, c) <- Date findFirstMatchIn "1/1/2001 marks the start of the millennium. 31/12/2000 doesn't.") { assert(a == "1") assert(b == "1") assert(c == "2001") } - for (Regex.Groups(a, b, c) <- (Date findAllIn "1/1/2001 marks the start of the millenium. 31/12/2000 doesn't.").matchData) { + for (Regex.Groups(a, b, c) <- (Date findAllIn "1/1/2001 marks the start of the millennium. 31/12/2000 doesn't.").matchData) { assert(a == "1" || a == "31") assert(b == "1" || b == "12") assert(c == "2001" || c == "2000") |