Compare commits

..

No commits in common. "a2f9d77cb5712aae0d8534626cfceea3a28d04b0" and "fa5d423005e424732bb00850167f75ea71e6bf8e" have entirely different histories.

1 changed files with 7 additions and 13 deletions

View File

@ -8,12 +8,6 @@ import Repl
open Pantograph.Repl open Pantograph.Repl
open Pantograph.Protocol open Pantograph.Protocol
/-- Print a string to stdout without buffering -/
def printImmediate (s : String) : IO Unit := do
let stdout ← IO.getStdout
stdout.putStr (s ++ "\n")
stdout.flush
/-- Parse a command either in `{ "cmd": ..., "payload": ... }` form or `cmd { ... }` form. -/ /-- Parse a command either in `{ "cmd": ..., "payload": ... }` form or `cmd { ... }` form. -/
def parseCommand (s: String): Except String Command := do def parseCommand (s: String): Except String Command := do
match s.trim.get? 0 with match s.trim.get? 0 with
@ -40,27 +34,27 @@ partial def loop : MainM Unit := do repeat do
| .error error => | .error error =>
let error := Lean.toJson ({ error := "command", desc := error }: InteractionError) let error := Lean.toJson ({ error := "command", desc := error }: InteractionError)
-- Using `Lean.Json.compress` here to prevent newline -- Using `Lean.Json.compress` here to prevent newline
printImmediate error.compress IO.println error.compress
| .ok command => | .ok command =>
try try
let ret ← execute command let ret ← execute command
let str := match state.options.printJsonPretty with let str := match state.options.printJsonPretty with
| true => ret.pretty | true => ret.pretty
| false => ret.compress | false => ret.compress
printImmediate str IO.println str
catch e => catch e =>
let message := e.toString let message := e.toString
let error := Lean.toJson ({ error := "main", desc := message }: InteractionError) let error := Lean.toJson ({ error := "main", desc := message }: InteractionError)
printImmediate error.compress IO.println error.compress
def main (args: List String): IO Unit := do
unsafe def main (args: List String): IO Unit := do
-- NOTE: A more sophisticated scheme of command line argument handling is needed. -- NOTE: A more sophisticated scheme of command line argument handling is needed.
if args == ["--version"] then do if args == ["--version"] then do
IO.println s!"{Pantograph.version}" IO.println s!"{Pantograph.version}"
return return
unsafe do Pantograph.initSearch ""
Pantograph.initSearch ""
-- Separate imports and options -- Separate imports and options
let (options, imports) := args.partition (·.startsWith "--") let (options, imports) := args.partition (·.startsWith "--")
@ -68,7 +62,7 @@ def main (args: List String): IO Unit := do
let coreState ← Pantograph.createCoreState imports.toArray let coreState ← Pantograph.createCoreState imports.toArray
try try
let mainM := loop.run { coreContext } |>.run' { env := coreState.env } let mainM := loop.run { coreContext } |>.run' { env := coreState.env }
printImmediate "ready." IO.println "ready."
mainM mainM
catch ex => catch ex =>
let message := ex.toString let message := ex.toString