From 88de5784428bec9a4b32bdf447c160da29b3745e Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Mon, 4 Jan 2021 20:27:45 +0100 Subject: Make up to date --- Sil/Syntax.dcl | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'Sil/Syntax.dcl') diff --git a/Sil/Syntax.dcl b/Sil/Syntax.dcl index b99153e..632eb37 100644 --- a/Sil/Syntax.dcl +++ b/Sil/Syntax.dcl @@ -2,8 +2,6 @@ definition module Sil.Syntax from StdOverloaded import class toString -from Data.Maybe import :: Maybe - from Sil.Types import :: Type from Sil.Util.Parser import :: ParsePosition, class getPos @@ -33,15 +31,15 @@ from Sil.Util.Parser import :: ParsePosition, class getPos :: Initialisation = { init_type :: Type , init_name :: Name - , init_value :: Maybe Expression + , init_value :: ?Expression , init_pos :: ParsePosition } :: Statement = Declaration ParsePosition Name Expression | Application ParsePosition Expression - | Return ParsePosition (Maybe Expression) - | If ParsePosition [(Expression, CodeBlock)] (Maybe CodeBlock) + | Return ParsePosition (?Expression) + | If ParsePosition [(Expression, CodeBlock)] (?CodeBlock) | While ParsePosition Expression CodeBlock | MachineStm ParsePosition String @@ -53,7 +51,7 @@ from Sil.Util.Parser import :: ParsePosition, class getPos | BuiltinApp2 ParsePosition Expression Op2 Expression | Field ParsePosition Name Expression | Tuple ParsePosition Int [Expression] - | List ParsePosition (Maybe Type) [Expression] + | List ParsePosition (?Type) [Expression] :: Op1 = Neg //* ~ -- cgit v1.2.3