File tree 2 files changed +21
-18
lines changed
main/scala/scala/util/parsing/combinator
test/scala/scala/util/parsing/combinator
2 files changed +21
-18
lines changed Original file line number Diff line number Diff line change @@ -948,12 +948,12 @@ trait Parsers {
948
948
*/
949
949
trait OnceParser [+ T ] extends Parser [T ] {
950
950
override def ~ [U ](p : => Parser [U ]): Parser [~ [T , U ]]
951
- = OnceParser { (for (a <- this ; b <- commit(p)) yield new ~ (a,b)).named(" ~" ) }
951
+ = OnceParser { (for (a <- this ; b <- commit(p)) yield new ~ (a,b)).named(" ~" ) }
952
952
953
953
override def ~> [U ](p : => Parser [U ]): Parser [U ]
954
- = OnceParser { (for (a <- this ; b <- commit(p)) yield b).named(" ~>" ) }
954
+ = OnceParser { (for (a <- this ; b <- commit(p)) yield b).named(" ~>" ) }
955
955
956
956
override def <~ [U ](p : => Parser [U ]): Parser [T ]
957
- = OnceParser { (for (a <- this ; b <- commit(p)) yield a).named(" <~" ) }
957
+ = OnceParser { (for (a <- this ; b <- commit(p)) yield a).named(" <~" ) }
958
958
}
959
959
}
Original file line number Diff line number Diff line change @@ -15,25 +15,28 @@ class t6464 {
15
15
| " <%" ~! err(" should not fail here, because of ~!" ))
16
16
17
17
}
18
- @ Test
19
- def test : Unit = {
20
- assertEquals(
21
- " [1.9] parsed: ((((<%~List( ))~hi)~List( ))~%>)" ,
22
- SspParser .phrase(SspParser .ok)(new CharSequenceReader (" <% hi %>" )).toString)
23
- val expected = """ [1.7] error: string matching regex '\w+' expected but '%' found
18
+
19
+ @ Test
20
+ def test : Unit = {
21
+ assertEquals(
22
+ " [1.9] parsed: ((((<%~List( ))~hi)~List( ))~%>)" ,
23
+ SspParser .phrase(SspParser .ok)(new CharSequenceReader (" <% hi %>" )).toString)
24
+
25
+ val expected = """ [1.7] error: string matching regex '\w+' expected but '%' found
24
26
25
27
<% %>
26
28
^"""
27
- assertEquals(
28
- expected,
29
- SspParser .phrase(SspParser .ok)(new CharSequenceReader (" <% %>" )).toString)
30
29
31
- assertEquals(
32
- " [1.9] parsed: hi" ,
33
- SspParser .phrase(SspParser .buggy)(new CharSequenceReader (" <% hi %>" )).toString)
30
+ assertEquals(
31
+ expected,
32
+ SspParser .phrase(SspParser .ok)(new CharSequenceReader (" <% %>" )).toString)
33
+
34
+ assertEquals(
35
+ " [1.9] parsed: hi" ,
36
+ SspParser .phrase(SspParser .buggy)(new CharSequenceReader (" <% hi %>" )).toString)
34
37
35
- assertEquals(
36
- expected,
37
- SspParser .phrase(SspParser .buggy)(new CharSequenceReader (" <% %>" )).toString)
38
+ assertEquals(
39
+ expected,
40
+ SspParser .phrase(SspParser .buggy)(new CharSequenceReader (" <% %>" )).toString)
38
41
}
39
42
}
You can’t perform that action at this time.
0 commit comments