Merge pull request #3 from TypedUseCase/fix/add-missing-keyword-if

Add missing KeyWord value to KeyWordIf

Author: MortalFlesh

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 <!-- There is always Unreleased section on the top. Subsections (Add, Changed, Fix, Removed) should be Add as needed. -->
 ## Unreleased
+- Add missing `KeyWord` value to `KeyWordIf`
 
 ## 2.0.0 - 2020-11-06
 - [**BC**] Add `alias` keyWord location to Parsed Participant Definition

src/Tuc/ParsedTypes.fs

@@ -153,10 +153,13 @@ and ParsedKeyWordWithBody<'Type> = {
 
 and ParsedKeyWordIf<'Type> = {
     Value: 'Type
+    IfKeyWord: KeyWord
     IfLocation: ParsedLocation
     ConditionLocation: ParsedLocation
-    ElseLocation: ParsedLocation option
     Body: Parsed<TucPart> list
+
+    ElseKeyWord: KeyWord option
+    ElseLocation: ParsedLocation option
     ElseBody: (Parsed<TucPart> list) option
 }
 
@@ -239,7 +242,7 @@ module Parsed =
         | Parsed.KeyWord k -> Parsed.KeyWord { KeyWord = k.KeyWord; KeyWordLocation = k.KeyWordLocation; ValueLocation = k.ValueLocation; Value = k.Value |> f }
         | Parsed.KeyWordWithoutValue k -> Parsed.KeyWordWithoutValue { KeyWord = k.KeyWord; KeyWordLocation = k.KeyWordLocation }
         | Parsed.KeyWordWithBody k -> Parsed.KeyWordWithBody { KeyWord = k.KeyWord; KeyWordLocation = k.KeyWordLocation; ValueLocation = k.ValueLocation; Body = k.Body; Value = k.Value |> f }
-        | Parsed.KeyWordIf k -> Parsed.KeyWordIf { IfLocation = k.IfLocation; ConditionLocation = k.ConditionLocation; ElseLocation = k.ElseLocation; Body = k.Body; ElseBody = k.ElseBody; Value = k.Value |> f }
+        | Parsed.KeyWordIf k -> Parsed.KeyWordIf { IfKeyWord = k.IfKeyWord; IfLocation = k.IfLocation; ConditionLocation = k.ConditionLocation; ElseKeyWord = k.ElseKeyWord; ElseLocation = k.ElseLocation; Body = k.Body; ElseBody = k.ElseBody; Value = k.Value |> f }
         | Parsed.ParticipantDefinition p -> Parsed.ParticipantDefinition { Context = p.Context; Domain = p.Domain; Alias = p.Alias; Value = p.Value |> f }
         | Parsed.ComponentDefinition c -> Parsed.ComponentDefinition { Context = c.Context; Domain = c.Domain; Participants = c.Participants; Value = c.Value |> f }
         | Parsed.Lifeline l -> Parsed.Lifeline { ParticipantLocation = l.ParticipantLocation; Execution = l.Execution; Value = l.Value |> f }

src/Tuc/Parser/Parser.fs

@@ -858,6 +858,7 @@ module Parser =
                                     Body = body |> List.map Parsed.value
                                     Else = elseBody |> Option.map (List.map Parsed.value)
                                 }
+                                IfKeyWord = KeyWord.If
                                 IfLocation = {
                                     Value = "if"
                                     Location = ifRange |> location
@@ -866,6 +867,7 @@ module Parser =
                                     Value = condition
                                     Location = ifRange |> Range.fromEnd 1 condition.Length |> location
                                 }
+                                ElseKeyWord = elseRange |> Option.map (fun _ -> KeyWord.Else)
                                 ElseLocation = elseRange |> Option.map (fun elseRange ->
                                     {
                                         Value = "else"