don't overlap type and variant names
This commit is contained in:
parent
2e67fe38ce
commit
ac15bde327
37
Syntax.fs
37
Syntax.fs
@ -2,46 +2,45 @@ module VijiN.Syntax
|
||||
|
||||
type Variable = Variable of string
|
||||
|
||||
type Term = Text of string | Variable of Variable
|
||||
type Term = TextTerm of string | VarTerm of Variable
|
||||
|
||||
type Character = Character of Term
|
||||
// TODO: Character should probably have more, like selecting portrait outfit/style
|
||||
|
||||
type DirectivePrefix = Prefix of string
|
||||
type DirectiveInfix = Infix of string
|
||||
type DirectiveSuffix = Suffix of string
|
||||
type DirectiveOperator = DirectivePrefix * DirectiveInfix option * DirectiveSuffix option
|
||||
type DirectivePrefix = string
|
||||
type DirectiveInfix = string
|
||||
type DirectiveOperator = DirectivePrefix * DirectiveInfix
|
||||
|
||||
type DirectiveArg = Arg of Term
|
||||
type DirectiveArg = Arg of Term list
|
||||
type Directive = DirectiveOperator * DirectiveArg list list // TODO: non-empty list
|
||||
type Directives = Directive list // TODO: non-empty list
|
||||
|
||||
type ChoiceText = Text of Term
|
||||
type ChoiceValue = Value of Term
|
||||
type ChoiceText = ChoiceText of Term list
|
||||
type ChoiceValue = ChoiceValue of Term list
|
||||
type ChoiceOption = ChoiceText * ChoiceValue option
|
||||
type Choice = Variable * ChoiceOption list // TODO: non-empty list
|
||||
|
||||
type InlineDirective = Directive
|
||||
type SpokenText =
|
||||
| Plain of Term
|
||||
| Emphasis of Term
|
||||
| Yell of Term
|
||||
| Whisper of Term
|
||||
| Plain of Term list
|
||||
| Emphasis of Term list
|
||||
| Yell of Term list
|
||||
| Whisper of Term list
|
||||
type Spoken = Character option * InlineDirective list * SpokenText list // TODO: non-empty list
|
||||
|
||||
type Comment = Comment of string
|
||||
|
||||
type Line =
|
||||
| Spoken of Spoken
|
||||
| Directive of Directives
|
||||
| Comment of Comment
|
||||
| Choice of Choice
|
||||
| SpokenLine of Spoken
|
||||
| DirectiveLine of Directives
|
||||
| CommentLine of Comment
|
||||
| ChoiceLine of Choice
|
||||
|
||||
type LineNumber = Line of int // TODO: >= 1
|
||||
type PageNumber = Page of int // TODO: >= 1
|
||||
type LineNumber = LineNo of int // TODO: >= 1
|
||||
type PageNumber = PageNo of int // TODO: >= 1
|
||||
type ScriptLine = LineNumber * PageNumber * Line
|
||||
// TODO: other diffing metadata
|
||||
|
||||
type SceneName = Name of string
|
||||
type SceneName = SceneName of string
|
||||
|
||||
type Scene = SceneName * Character list * ScriptLine list
|
||||
|
Loading…
Reference in New Issue
Block a user