Skip to content

Commit

Permalink
RakuAST: group all alphanumeric infixes together
Browse files Browse the repository at this point in the history 
As their parsing requires a word boundary, and will need additional
handling for non-English language versions.
  • Loading branch information
@lizmat
lizmat committed Sep 10, 2023
1 parent d192c18 commit 6817b10
Showing 1 changed file with 44 additions and 52 deletions.
96 changes: 44 additions & 52 deletions src/Raku/Grammar.nqp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2040,9 +2040,52 @@ grammar Raku::Grammar is HLL::Grammar does Raku::Common {
token prefix:sym<not> { <sym><.end-prefix> }
#-------------------------------------------------------------------------------
# Infixes
# Alpha infixes that need a right word boundary, and which will need special
# handling for non-English versions of the Raku Programming Language
proto token infix {*}
token infix:sym<after> { <sym> » }
token infix:sym<and> { <sym> » }
token infix:sym<andthen> { <sym> » }
token infix:sym<before> { <sym> » }
token infix:sym<but> { <sym> » }
token infix:sym<cmp> { <sym> » }
token infix:sym<coll> { <sym> » }
token infix:sym<div> { <sym> » }
token infix:sym<does> { <sym> » }
token infix:sym«eq» { <sym> » }
token infix:sym<eqv> { <sym> » }
token infix:sym<ff> { <sym> » }
token infix:sym<^ff> { <sym> » }
token infix:sym<ff^> { <sym> » }
token infix:sym<^ff^> { <sym> » }
token infix:sym<fff> { <sym> » }
token infix:sym<^fff> { <sym> » }
token infix:sym<fff^> { <sym> » }
token infix:sym<^fff^> { <sym> » }
token infix:sym<gcd> { <sym> » }
token infix:sym«ge» { <sym> » }
token infix:sym«gt» { <sym> » }
token infix:sym<lcm> { <sym> » }
token infix:sym«le» { <sym> » }
token infix:sym<leg> { <sym> » }
token infix:sym«lt» { <sym> » }
token infix:sym<max> { <sym> » }
token infix:sym<min> { <sym> » }
token infix:sym<minmax> { <sym> » }
token infix:sym<mod> { <sym> » }
token infix:sym«ne» { <sym> » }
token infix:sym<notandthen> { <sym> » }
token infix:sym<or> { <sym> » }
token infix:sym<orelse> { <sym> » }
token infix:sym<unicmp> { <sym> » }
token infix:sym<x> { <sym> » }
token infix:sym<xor> { <sym> » }
token infix:sym<xx> { <sym> » }
#-------------------------------------------------------------------------------
# Other infixes
token infix:sym<**> { <sym> }
# Dotty infixes
Expand Down Expand Up @@ -2072,12 +2115,6 @@ grammar Raku::Grammar is HLL::Grammar does Raku::Common {
token infix:sym<%%> { <sym> }
token infix:sym<?&> { <sym> }
# Multiplicative infixes requiring a word bound on the right side
token infix:sym<div> { <sym> » }
token infix:sym<gcd> { <sym> » }
token infix:sym<lcm> { <sym> » }
token infix:sym<mod> { <sym> » }
# Multiplicatve infixes with meta interaction
token infix:sym«+<» {
<sym>
Expand Down Expand Up @@ -2151,10 +2188,6 @@ grammar Raku::Grammar is HLL::Grammar does Raku::Common {
token infix:sym<~|> { <sym> }
token infix:sym<~^> { <sym> }
# Replicating infixes
token infix:sym<x> { <sym> » }
token infix:sym<xx> { <sym> » }
# Concatenating infixes
token infix:sym<~> { <sym> }
token infix:sym<∘> { <sym> }
Expand Down Expand Up @@ -2185,17 +2218,6 @@ grammar Raku::Grammar is HLL::Grammar does Raku::Common {
token infix:sym«!=» { <sym> <?before \s|']'>}
# Chaining infixes requiring word-boundary on right side
token infix:sym«eq» { <sym> » }
token infix:sym«ne» { <sym> » }
token infix:sym«le» { <sym> » }
token infix:sym«ge» { <sym> » }
token infix:sym«lt» { <sym> » }
token infix:sym«gt» { <sym> » }
token infix:sym<eqv> { <sym> » }
token infix:sym<before> { <sym> » }
token infix:sym<after> { <sym> » }
# Other chaining infixes
token infix:sym«=~=» { <sym> }
token infix:sym«≅» { <sym> }
Expand Down Expand Up @@ -2240,9 +2262,6 @@ grammar Raku::Grammar is HLL::Grammar does Raku::Common {
token infix:sym<//> { <sym> }
token infix:sym<^^> { <sym> }
token infix:sym<min> { <sym> » }
token infix:sym<max> { <sym> » }
# Parsing of the ?? !! ternary is really treated as an infix, where the
# left side is the condition, the right side is the "else" expression,
# and the '?? expression !!' is initially parsed as the operator.
Expand Down Expand Up @@ -2282,7 +2301,6 @@ grammar Raku::Grammar is HLL::Grammar does Raku::Common {
token infix:sym<X> { <!before <.sym> <.infixish>> <sym> }
token infix:sym<Z> { <!before <.sym> <.infixish>> <sym> }
token infix:sym<minmax> { <sym> » }
token infix:sym<...> { <sym> }
token infix:sym<…> { <sym> }
Expand All @@ -2301,15 +2319,6 @@ grammar Raku::Grammar is HLL::Grammar does Raku::Common {
<.obs: '? and : for the ternary conditional operator', '?? and !!'>
}
token infix:sym<ff> { <sym> }
token infix:sym<^ff> { <sym> }
token infix:sym<ff^> { <sym> }
token infix:sym<^ff^> { <sym> }
token infix:sym<fff> { <sym> }
token infix:sym<^fff> { <sym> }
token infix:sym<fff^> { <sym> }
token infix:sym<^fff^> { <sym> }
token infix:sym<=> {
<sym>
:my $*ITEM := $*LEFTSIGIL eq '$' || $*IN-META;
Expand All @@ -2323,16 +2332,6 @@ grammar Raku::Grammar is HLL::Grammar does Raku::Common {
token infix:sym<⚛-=> { <sym> }
token infix:sym<⚛−=> { <sym> }
token infix:sym<and> { <sym> » }
token infix:sym<andthen> { <sym> » }
token infix:sym<notandthen> { <sym> » }
token infix:sym<or> { <sym> » }
token infix:sym<xor> { <sym> » }
token infix:sym<orelse> { <sym> » }
token infix:sym<..> {
<sym>
[
Expand All @@ -2342,13 +2341,6 @@ grammar Raku::Grammar is HLL::Grammar does Raku::Common {
]?
}
token infix:sym<but> { <sym> » }
token infix:sym<cmp> { <sym> » }
token infix:sym<coll> { <sym> » }
token infix:sym<does> { <sym> » }
token infix:sym<leg> { <sym> » }
token infix:sym<unicmp> { <sym> » }
token infix:sym<^..> { <sym> }
token infix:sym<..^> { <sym> }
token infix:sym<^..^> { <sym> }
Expand Down

0 comments on commit 6817b10

Please sign in to comment.