Tweak syntax for protocol variants

signalspec · Jul 24, 2017 · 73ddf52 · 73ddf52
1 parent 16e0ea7
commit 73ddf52
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/spi.signalspec b/lib/spi.signalspec
@@ -2,12 +2,12 @@ let bit = #0|#1
 let byte = [bit, bit, bit, bit, bit, bit, bit, bit]
 
 protocol SPI() {
-  byte
-  #start
-  #end
+  byte,
+  #start,
+  #end,
 }
 
-with (#h|#l, #h|#l)
+with (#h|#l, #h|#l, #h|#l)
 def spi(): SPI() {
   repeat <: #10 { (#h, <: #l, <: #l) }
   repeat {

diff --git a/src/language/signalspec.rustpeg b/src/language/signalspec.rustpeg
@@ -53,7 +53,7 @@ block -> ast::Block
           { ast::AltArm { discriminant:expr, block:block } }
 
 protocol_block -> Vec<ast::ProtocolEntry>
-  = LBRACE entries:(entry:protocol_entry**(SEMICOLON?) {entry}) RBRACE
+  = LBRACE entries:(protocol_entry**COMMA) COMMA? RBRACE
     { entries }
 
   protocol_entry -> ast::ProtocolEntry

diff --git a/tests/check/tuple.signalspec b/tests/check/tuple.signalspec
@@ -1,6 +1,6 @@
 let t = #a|#b|#c|#d
 
-with t
+with (t, t)
 def main() {
     (#a, #b)
     (#c, #d)