Author: pmichaud
Date: Wed May 7 16:50:58 2008
New Revision: 27387
Modified:
trunk/compilers/nqp/src/Grammar.pg
trunk/compilers/tge/TGE/Parser.pg
trunk/languages/APL/src/parser/grammar.pg
trunk/languages/abc/src/grammar.pg
trunk/languages/lolcode/src/parser/grammar.pg
trunk/languages/punie/src/parser/grammar.pg
trunk/languages/pynie/src/parser/Grammar.pg
trunk/runtime/parrot/library/PGE/Perl6Grammar.pir
trunk/t/compilers/pge/pge_util.t
Log:
* Convert a variety of <foo: xyz> into <foo: 'xyz'>. (RT#53606)
Modified: trunk/compilers/nqp/src/Grammar.pg
==============================================================================
--- trunk/compilers/nqp/src/Grammar.pg (original)
+++ trunk/compilers/nqp/src/Grammar.pg Wed May 7 16:50:58 2008
@@ -22,7 +22,7 @@
token TOP {
<statement_block>
- [ $ || <panic: Syntax error> ]
+ [ $ || <panic: 'Syntax error'> ]
{*}
}
@@ -85,7 +85,7 @@
## Parse a list of statements.
rule statement_list {
[ <statement>
- [ <.statement_end> || <panic: Statement not terminated properly> ]
+ [ <.statement_end> || <panic: 'Statement not terminated properly'> ]
]*
{*}
}
@@ -174,13 +174,13 @@
rule return_statement {
$<sym>=['return']
- [ <EXPR> || <panic: Unable to parse argument to 'return'> ]
+ [ <EXPR> || <panic: 'Unable to parse argument to "return"'> ]
{*}
}
rule make_statement {
$<sym>=['make']
- [ <EXPR> || <panic: Unable to parse argument to 'make'> ]
+ [ <EXPR> || <panic: 'Unable to parse argument to "make"'> ]
{*}
}
@@ -205,7 +205,7 @@
token block {
'{'
<statement_block>
- [ '}' || <panic: Missing '}'> ]
+ [ '}' || <panic: 'Missing "}"'> ]
[ \h* [ \# \N* ]? \n <.MARK_STATEMENT_END> ]?
{*}
}
@@ -262,7 +262,7 @@
token methodop {
'.' <ident>
'(' <arglist>
- [ <.ws> ')' || <panic: Missing ')'> ]
+ [ <.ws> ')' || <panic: "Missing ')'"> ]
{*} #= methodop
}
@@ -270,7 +270,7 @@
| '(' <arglist> ')' {*} #= ( )
| '[' <EXPR> <.ws> ']' {*} #= [ ]
| '{' <EXPR> <.ws> '}' {*} #= { }
- | '<' <string_literal: \>> '>' {*} #= < >
+ | '<' <string_literal: '>' > '>' {*} #= < >
}
rule arglist {
Modified: trunk/compilers/tge/TGE/Parser.pg
==============================================================================
--- trunk/compilers/tge/TGE/Parser.pg (original)
+++ trunk/compilers/tge/TGE/Parser.pg Wed May 7 16:50:58 2008
@@ -57,4 +57,4 @@
[\n|$]
}
-token syntax_error { <?die: Syntax error> }
+token syntax_error { <?die: 'Syntax error'> }
Modified: trunk/languages/APL/src/parser/grammar.pg
==============================================================================
--- trunk/languages/APL/src/parser/grammar.pg (original)
+++ trunk/languages/APL/src/parser/grammar.pg Wed May 7 16:50:58 2008
@@ -5,7 +5,7 @@
token statement_list { ^<statement> [ \n <statement> ]* {*} }
-token statement { <expression> [ \s*? $$ | <panic: Syntax error> ] {*} }
+token statement { <expression> [ \s*? $$ | <panic: 'Syntax error'> ] {*} }
token expression {
| <target> '←' <expression> {*} #= assign
Modified: trunk/languages/abc/src/grammar.pg
==============================================================================
--- trunk/languages/abc/src/grammar.pg (original)
+++ trunk/languages/abc/src/grammar.pg Wed May 7 16:50:58 2008
@@ -20,7 +20,7 @@
rule TOP {
^ <statement_list>
- [ $ || <panic: parse error> ]
+ [ $ || <panic: 'parse error'> ]
{*}
}
@@ -68,7 +68,7 @@
token string {
- '"' <string_literal: "> '"'
+ '"' <string_literal: '"'> '"'
{*}
}
Modified: trunk/languages/lolcode/src/parser/grammar.pg
==============================================================================
--- trunk/languages/lolcode/src/parser/grammar.pg (original)
+++ trunk/languages/lolcode/src/parser/grammar.pg Wed May 7 16:50:58 2008
@@ -12,7 +12,7 @@
'HAI' <version> <statement_terminator>
<block>
'KTHXBYE' <statement_terminator>
- [ $ || <panic: Syntax error> ]
+ [ $ || <panic: 'Syntax error'> ]
{*}
}
Modified: trunk/languages/punie/src/parser/grammar.pg
==============================================================================
--- trunk/languages/punie/src/parser/grammar.pg (original)
+++ trunk/languages/punie/src/parser/grammar.pg Wed May 7 16:50:58 2008
@@ -4,7 +4,7 @@
grammar Punie::Grammar is PCT::Grammar;
token TOP {
- <lineseq> [ $ || <panic: parse error> ] {*}
+ <lineseq> [ $ || <panic: 'parse error'> ] {*}
}
token ws {
@@ -207,9 +207,9 @@
}
token integer { \d+ {*} }
token number { \d+\.\d+ {*} }
-token stringdouble { '"' <string_literal: "> '"' {*} }
-token stringsingle { \' <string_literal: '> \' {*} }
-token stringbacktick { \` <string_literal: `> \` {*} }
+token stringdouble { '"' <string_literal: '"' > '"' {*} }
+token stringsingle { \' <string_literal: '\'' > \' {*} }
+token stringbacktick { \` <string_literal: '`'> \` {*} }
rule subcall { do $<sym>=<word> \( <expr>? \) {*} }
rule opcall { $<sym>=<op> \( <expr>? \) {*} }
Modified: trunk/languages/pynie/src/parser/Grammar.pg
==============================================================================
--- trunk/languages/pynie/src/parser/Grammar.pg (original)
+++ trunk/languages/pynie/src/parser/Grammar.pg Wed May 7 16:50:58 2008
@@ -25,7 +25,7 @@
token file_input {
^ [ <.newline> | <statement> ]*
- [ $ | <.panic: syntax_error> ]
+ [ $ | <.panic: 'syntax_error'> ]
{*}
}
@@ -41,7 +41,7 @@
token suite2 {
<.newline> <.indent> <statement>
[ <.indent_same> <statement> ]*
- [ <.dedent> | <.panic: IndentationError: unindent does not match any outer
indentation level> ]
+ [ <.dedent> | <.panic: 'IndentationError: unindent does not match any
outer indentation level'> ]
{*}
}
Modified: trunk/runtime/parrot/library/PGE/Perl6Grammar.pir
==============================================================================
--- trunk/runtime/parrot/library/PGE/Perl6Grammar.pir (original)
+++ trunk/runtime/parrot/library/PGE/Perl6Grammar.pir Wed May 7 16:50:58 2008
@@ -109,11 +109,11 @@
| $<cmd>:=(regex|token|rule)
$<name>:=<arg>
$<optable>:=(is optable)?
- [ \{<regex>\} | <?PGE::Util::die: unable to parse regex> ]
+ [ \{<regex>\} | <?PGE::Util::die: 'unable to parse regex'> ]
| [multi]? $<cmd>:=(proto)
$<name>:=<arg>
( is $<trait>:=[\w+]['('<arg>')']? )*
- [ \{ <-[}]>*: \} | ';' | <?PGE::Util::die: missing proto/sub body> ]
+ [ \{ <-[}]>*: \} | ';' | <?PGE::Util::die: 'missing proto/sub body'>
]
| [$|<PGE::Util::die: unrecognized statement>]
STMT_PARSE
$P0 = p6regex($S0, 'grammar'=>'PGE::Perl6Grammar', 'name'=>'statement',
'w'=>1)
Modified: trunk/t/compilers/pge/pge_util.t
==============================================================================
--- trunk/t/compilers/pge/pge_util.t (original)
+++ trunk/t/compilers/pge/pge_util.t Wed May 7 16:50:58 2008
@@ -22,7 +22,7 @@
my $str = "How will this\nstring choose\nto explode?\n\nTest";
p6rule_error_like(
$str,
- 'expl <PGE::Util::die: kaboom>',
+ "expl <PGE::Util::die: 'kaboom'>",
qr/^kaboom at line 3, near "ode\?\\n\\n/, "die"
);
