Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pretty printing #1

Merged
merged 1 commit into from
Jan 3, 2021
Merged

Fix pretty printing #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 22 additions & 7 deletions ocaml/ast.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,14 +377,23 @@ let show_unless expected actual =
else string_of_int actual

let background s = "{ " ^ s ^ " & }"


let is_compound = function
| Command _ -> false
| _ -> true

let is_bg = function
| Pipe (bg,_) -> bg
| Background _ -> true
| _ -> false

let rec to_string = function
| Command (_,assigns,cmds,redirs) ->
separated string_of_assign assigns ^
(if List.length assigns = 0 || List.length cmds = 0 then "" else " ") ^
separated string_of_arg cmds ^ string_of_redirs redirs
| Pipe (bg,ps) ->
let p = intercalate " | " (List.map to_string ps) in
let p = intercalate " | " (List.map inner ps) in
if bg then background p else p
| Redir (_,a,redirs) ->
to_string a ^ string_of_redirs redirs
Expand All @@ -401,13 +410,13 @@ let rec to_string = function
backgrounded?" so the braces resolve the issue. testing
indicates that they're semantically equivalent.
*)
background (to_string a ^ string_of_redirs redirs)
background (inner a ^ string_of_redirs redirs)
| Subshell (_,a,redirs) ->
parens (to_string a ^ string_of_redirs redirs)
| And (a1,a2) -> to_string a1 ^ " && " ^ to_string a2
| Or (a1,a2) -> to_string a1 ^ " || " ^ to_string a2
| Not a -> "! " ^ braces (to_string a)
| Semi (a1,a2) -> to_string a1 ^ " ; " ^ to_string a2
| And (a1,a2) -> inner a1 ^ " && " ^ inner a2
| Or (a1,a2) -> inner a1 ^ " || " ^ inner a2
| Not a -> "! " ^ braces (inner a)
| Semi (a1,a2) -> inner a1 ^ " ; " ^ to_string a2
| If (c,t,e) -> string_of_if c t e
| While (Not t,b) ->
"until " ^ to_string t ^ "; do " ^ to_string b ^ "; done "
Expand All @@ -420,6 +429,12 @@ let rec to_string = function
"case " ^ string_of_arg a ^ " in " ^
separated string_of_case cs ^ " esac"
| Defun (_,name,body) -> name ^ "() {\n" ^ to_string body ^ "\n}"

and inner a =
let bg = is_bg a in
if is_compound a
then "{ " ^ to_string a ^ " " ^ (if bg then "&" else ";") ^ " }"
else to_string a ^ (if bg then " &" else "")

and string_of_if c t e =
"if " ^ to_string c ^
Expand Down