Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/AxiomSet.res
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module Make = (
module Rule = Rule.Make(Term, Judgment)
module RuleView = RuleView.Make(Term, Judgment, JudgmentView)
module Ports = Ports(Term, Judgment)
type state = { rules: dict<Rule.t> }
type state = {rules: dict<Rule.t>}
type props = {
content: state,
imports: Ports.t,
Expand Down Expand Up @@ -49,8 +49,9 @@ module Make = (
}
}
ret.contents->Result.map(state => (
{rules: state },
{Ports.facts: state, ruleStyle: None, grammar: Term.emptyGrammar}))
{rules: state},
{Ports.facts: state, ruleStyle: None, grammar: Term.emptyGrammar},
))
}

let make = props => {
Expand All @@ -68,7 +69,9 @@ module Make = (
key={String.make(i)}
style={props.imports.ruleStyle->Option.getOr(Hybrid)}
>
<span className="rule-rulename-global"><IdentifierView identifier=n /></span>
<span className="rule-rulename-global">
<IdentifierView identifier=n />
</span>
</RuleView>
)
->React.array}
Expand Down
31 changes: 23 additions & 8 deletions src/ConfigBlock.res
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,15 @@ module Make = (Term: TERM, Judgment: JUDGMENT with module Term := Term) => {

let deserialise = str =>
switch str {
| "Gentzen" => Ok((Gentzen, {Ports.facts: Dict.make(), ruleStyle: Some(Gentzen), grammar: Term.emptyGrammar}))
| "Linear" => Ok((Linear, {Ports.facts: Dict.make(), ruleStyle: Some(Linear), grammar: Term.emptyGrammar}))
| "Hybrid" => Ok((Hybrid, {Ports.facts: Dict.make(), ruleStyle: Some(Hybrid), grammar: Term.emptyGrammar}))
| "Gentzen" =>
Ok((
Gentzen,
{Ports.facts: Dict.make(), ruleStyle: Some(Gentzen), grammar: Term.emptyGrammar},
))
| "Linear" =>
Ok((Linear, {Ports.facts: Dict.make(), ruleStyle: Some(Linear), grammar: Term.emptyGrammar}))
| "Hybrid" =>
Ok((Hybrid, {Ports.facts: Dict.make(), ruleStyle: Some(Hybrid), grammar: Term.emptyGrammar}))
| _ => Error("unknown rule style")
}

Expand All @@ -42,22 +48,31 @@ module Make = (Term: TERM, Judgment: JUDGMENT with module Term := Term) => {
switch deserialise(value) {
| Ok((sty, _)) => {
setStyle(_ => sty)
props.onChange(sty, ~exports={Ports.facts: Dict.make(), ruleStyle: Some(sty), grammar: Term.emptyGrammar})
props.onChange(
sty,
~exports={Ports.facts: Dict.make(), ruleStyle: Some(sty), grammar: Term.emptyGrammar},
)
}
| Error(_) => ()
}
}

<div className="settings-panel">
<div className="settings-row">
<label className="settings-label" htmlFor="rule-style-select"> {React.string("Rule display style")} </label>
<select id="rule-style-select" className="settings-select" value={serialise(style)} onChange>
<label className="settings-label" htmlFor="rule-style-select">
{React.string("Rule display style")}
</label>
<select
id="rule-style-select" className="settings-select" value={serialise(style)} onChange
>
{[Gentzen, Linear, Hybrid]
->Array.map(n => <option key={serialise(n)} value={serialise(n)}> {React.string(serialise(n))} </option>)
->Array.map(n =>
<option key={serialise(n)} value={serialise(n)}> {React.string(serialise(n))} </option>
)
->React.array}
</select>
<div className="settings-desc"> {React.string(describe(style))} </div>
</div>
</div>
}
}
}
27 changes: 17 additions & 10 deletions src/EditableLabel.res
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


@react.component
let make = (~label: string, ~onConfirm: string => result<unit, string>) => {
let (isEditing, setIsEditing) = React.useState(() => false)
Expand Down Expand Up @@ -42,17 +40,24 @@ let make = (~label: string, ~onConfirm: string => result<unit, string>) => {
onChange={evt => setTempText(_ => ReactEvent.Form.target(evt)["value"])}
onKeyDown={evt => {
let key = ReactEvent.Keyboard.key(evt)
if key == "Enter" { handleConfirm(evt) }
else if key == "Escape" { handleCancel(evt) }
if key == "Enter" {
handleConfirm(evt)
} else if key == "Escape" {
handleCancel(evt)
}
}}
autoFocus=true
/>
<span
className="editor-button button-icon button-icon-blue typcn typcn-tick"
onClick={handleConfirm}> </span>
<span
className="editor-button button-icon button-icon-red typcn typcn-times"
onClick={handleCancel}> </span>
onClick={handleConfirm}
>
</span>
<span
className="editor-button button-icon button-icon-red typcn typcn-times"
onClick={handleCancel}
>
</span>
</div>

{switch errorMsg {
Expand All @@ -61,7 +66,8 @@ let make = (~label: string, ~onConfirm: string => result<unit, string>) => {
<span> {React.string(msg)} </span>
<span
className="editor-button button-icon button-icon-grey typcn typcn-times"
onClick={dismissError}>
onClick={dismissError}
>
</span>
</div>
| None => React.null
Expand All @@ -74,7 +80,8 @@ let make = (~label: string, ~onConfirm: string => result<unit, string>) => {
setTempText(_ => text)
setErrorMsg(_ => None)
setIsEditing(_ => true)
}}>
}}
>
<IdentifierView identifier=text />
</span>
}}
Expand Down
Loading
Loading