diff --git a/parser/src/socool.lalrpop b/parser/src/socool.lalrpop index 19ad7663..e2e8ecc7 100644 --- a/parser/src/socool.lalrpop +++ b/parser/src/socool.lalrpop @@ -407,7 +407,22 @@ BracedOvertone: Term = { } + +Parenthesized: T = { + => t, + "(" ")" => t, +}; + +Lets: Vec = { + )*> => v +}; Overtones = Comma; +Compose = Pipe; +Operations = Comma; +CoefStart: (i64, i64) = { + "|" => (n, d), +} + Comma: Vec = { ",")*> => match e { @@ -420,16 +435,6 @@ Comma: Vec = { } }; -Parenthesized: T = { - => t, - "(" ")" => t, -}; - - -Lets: Vec = { - )*> => v -}; - Pipe: Vec = { "|")+> => match e { None=> v, @@ -452,10 +457,6 @@ Concat: Vec = { } }; -Compose = Pipe; - -Operations = Comma; - Ints = Comma; Rational: Rational64 = { @@ -466,9 +467,6 @@ Rational: Rational64 = { }; -CoefStart: (i64, i64) = { - "|" => (n, d), -} Axis: Axis = {