GitHub/haskell-wasm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of some shift/reduce conflicts in grammar

Browse Source
This commit is contained in:
Ilya Rezvov
2021-03-19 22:25:47 -07:00
parent 03f9386c8a
commit a6692fdef9
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Language/Wasm/Parser.y
+16 -19
View File
@@ -584,10 +584,7 @@ typeuse1_cont(next)
(FuncType [] [], next) -> (IndexedTypeUse $2 Nothing, next) (FuncType [] [], next) -> (IndexedTypeUse $2 Nothing, next)
(ft, next) -> (IndexedTypeUse $2 (Just ft), next) (ft, next) -> (IndexedTypeUse $2 (Just ft), next)
} }
| typesign1(next) { | typesign1(next) { (AnonimousTypeUse $ fst $1, snd $1) }
let (ft, next) = $1 in
(AnonimousTypeUse ft, next)
}
typesign(next) typesign(next)
: '(' typesign1(next) { $2 } : '(' typesign1(next) { $2 }
@@ -648,20 +645,16 @@ raw_instr :: { [Instruction] }
let (tu, instr) = $2 in let (tu, instr) = $2 in
[PlainInstr $ CallIndirect tu] ++ fromMaybe [] instr [PlainInstr $ CallIndirect tu] ++ fromMaybe [] instr
} }
| 'block' opt(ident) raw_block {% (: []) `fmap` $3 $2 } | 'block' opt(ident) typeuse_cont(folded_instr1_list) 'end' opt(ident) {%
if $2 == $5 || isNothing $5
then
let (tu, instr) = $3 in
Right $ [BlockInstr $2 tu (fromMaybe [] instr)]
else Left "Block labels have to match"
}
| 'loop' opt(ident) raw_loop {% (: []) `fmap` $3 $2 } | 'loop' opt(ident) raw_loop {% (: []) `fmap` $3 $2 }
| 'if' opt(ident) raw_if_result {% $3 $2 } | 'if' opt(ident) raw_if_result {% $3 $2 }
raw_block :: { Maybe Ident -> Either String Instruction }
: typeuse_cont(folded_instr1) list(instruction) 'end' opt(ident) {
\ident ->
if ident == $4 || isNothing $4
then
let (tu, instr) = $1 in
Right $ BlockInstr ident tu (fromMaybe [] instr ++ concat $2)
else Left "Block labels have to match"
}
raw_loop :: { Maybe Ident -> Either String Instruction } raw_loop :: { Maybe Ident -> Either String Instruction }
: 'end' opt(ident) { : 'end' opt(ident) {
\ident -> \ident ->
@@ -731,15 +724,19 @@ raw_else :: { ([Instruction], Maybe Ident) }
folded_instr :: { [Instruction] } folded_instr :: { [Instruction] }
: '(' folded_instr1 { $2 } : '(' folded_instr1 { $2 }
folded_instr1_list :: { [Instruction] }
: folded_instr1_list instruction { $1 ++ $2 }
| folded_instr1 { $1 }
folded_instr1 :: { [Instruction] } folded_instr1 :: { [Instruction] }
: plaininstr list(folded_instr) ')' { concat $2 ++ [PlainInstr $1] } : plaininstr list(folded_instr) ')' { concat $2 ++ [PlainInstr $1] }
| 'call_indirect' typeuse_cont(folded_instr1) list(instruction) ')' { | 'call_indirect' typeuse_cont(folded_instr1_list) ')' {
let (tu, instr) = $2 in let (tu, instr) = $2 in
fromMaybe [] instr ++ concat $3 ++ [PlainInstr $ CallIndirect tu] fromMaybe [] instr ++ [PlainInstr $ CallIndirect tu]
} }
| 'block' opt(ident) typeuse_cont(folded_instr1) list(instruction) ')' { | 'block' opt(ident) typeuse_cont(folded_instr1_list) ')' {
let (typeUse, instr) = $3 in let (typeUse, instr) = $3 in
[BlockInstr $2 typeUse (fromMaybe [] instr ++ concat $4)] [BlockInstr $2 typeUse (fromMaybe [] instr)]
} }
| 'loop' opt(ident) folded_loop { [$3 $2] } | 'loop' opt(ident) folded_loop { [$3 $2] }
| 'if' opt(ident) '(' folded_if_result { $4 $2 } | 'if' opt(ident) '(' folded_if_result { $4 $2 }