Permalink
Browse files

Merge remote-tracking branch 'vic/master'

  • Loading branch information...
vic committed Sep 20, 2011
2 parents da0639f + e709b66 commit 92c80432ef9a9bc0f4e6190737d167da76879ab8
Showing with 4,732 additions and 4,702 deletions.
  1. +1 −1 lib/akin/grammar.kpeg
  2. +4,634 −4,634 lib/akin/grammar.rb
  3. +27 −27 lib/akin/shuffle.rb
  4. +3 −3 spec/grammar_spec.rb
  5. +4 −4 spec/operator_spec.rb
  6. +58 −32 spec/shuffle_spec.rb
  7. +5 −1 spec/spec_helper.rb
View
@@ -27,7 +27,7 @@ braced_(x) = braced_(x):a - "," - block(x):b {a + Array(b)}
| block(x):b ~Array(b)
block(x) = block(x):a ws* nl - block(x):b &{a.pos.column < b.pos.column}
- ~n(a.pos, :on, a, b)
+ { a.name == :chain && (a.args.push(b);a) || a.with(:chain, a, b) }
| block_(x):b {b.size > 1 && n(b.first.pos, :block, *b) || b.first}
block_(x) = block_(x):b - ";" s chain(x):c {Array(c)}:a {b + a}
| block_(x):b s chain(x):c {Array(c)}:a
Oops, something went wrong.

0 comments on commit 92c8043

Please sign in to comment.