Unitfy pp_varlist
, pp_argvarlist
and pp_decvarlist
This commit is contained in:
parent
eac8c6893c
commit
38f58f7558
@ -7,44 +7,46 @@ let pp_loc fmt (start, stop) =
|
|||||||
start.pos_lnum start.pos_cnum
|
start.pos_lnum start.pos_cnum
|
||||||
stop.pos_lnum stop.pos_cnum)
|
stop.pos_lnum stop.pos_cnum)
|
||||||
|
|
||||||
(* could use an argument instead of redefining these functions, if possible *)
|
type var_list_delim =
|
||||||
let rec pp_varlist fmt : t_varlist -> unit = function
|
| Base
|
||||||
| ([], []) -> ()
|
| Arg
|
||||||
| ([TInt] , IVar h :: []) -> Format.fprintf fmt "%s" h
|
| Dec
|
||||||
| ([TReal], RVar h :: []) -> Format.fprintf fmt "%s" h
|
|
||||||
| ([TBool], BVar h :: []) -> Format.fprintf fmt "%s" h
|
|
||||||
| (TInt :: tl, IVar h :: h' :: l) ->
|
|
||||||
Format.fprintf fmt "%s, %a" h pp_varlist (tl, h' :: l)
|
|
||||||
| (TBool :: tl, BVar h :: h' :: l) ->
|
|
||||||
Format.fprintf fmt "%s, %a" h pp_varlist (tl, h' :: l)
|
|
||||||
| (TReal :: tl, RVar h :: h' :: l) ->
|
|
||||||
Format.fprintf fmt "%s, %a" h pp_varlist (tl, h' :: l)
|
|
||||||
| _ -> raise (MyTypeError "This exception should not have beed be raised.")
|
|
||||||
|
|
||||||
let rec pp_argvarlist fmt : t_varlist -> unit = function
|
let rec pp_varlist var_list_delim fmt : t_varlist -> unit = function
|
||||||
| ([], []) -> ()
|
| ([], []) -> ()
|
||||||
| ([TInt] , IVar h :: []) -> Format.fprintf fmt "int %s" h
|
| ([TInt] , IVar h :: []) -> let s = "" in Format.fprintf fmt (
|
||||||
| ([TReal], RVar h :: []) -> Format.fprintf fmt "float %s" h
|
match var_list_delim with
|
||||||
| ([TBool], BVar h :: []) -> Format.fprintf fmt "bool %s" h
|
| Base -> "%s"
|
||||||
|
| Arg -> "int %s"
|
||||||
|
| Dec -> "int %s;") h
|
||||||
|
| ([TReal], RVar h :: []) -> Format.fprintf fmt (
|
||||||
|
match var_list_delim with
|
||||||
|
| Base -> "%s"
|
||||||
|
| Arg -> "float %s"
|
||||||
|
| Dec -> "float %s;") h
|
||||||
|
| ([TBool], BVar h :: []) -> Format.fprintf fmt (
|
||||||
|
match var_list_delim with
|
||||||
|
| Base -> "%s"
|
||||||
|
| Arg -> "bool %s"
|
||||||
|
| Dec -> "bool %s;") h
|
||||||
| (TInt :: tl, IVar h :: h' :: l) ->
|
| (TInt :: tl, IVar h :: h' :: l) ->
|
||||||
Format.fprintf fmt "int %s, %a" h pp_argvarlist (tl, h' :: l)
|
Format.fprintf fmt (
|
||||||
|
match var_list_delim with
|
||||||
|
| Base -> "%s, %a"
|
||||||
|
| Arg -> "int %s, %a"
|
||||||
|
| Dec -> "int %s;\n\t%a") h (pp_varlist var_list_delim) (tl, h' :: l)
|
||||||
| (TBool :: tl, BVar h :: h' :: l) ->
|
| (TBool :: tl, BVar h :: h' :: l) ->
|
||||||
Format.fprintf fmt "bool %s, %a" h pp_argvarlist (tl, h' :: l)
|
Format.fprintf fmt (
|
||||||
|
match var_list_delim with
|
||||||
|
| Base -> "%s, %a"
|
||||||
|
| Arg -> "bool %s, %a"
|
||||||
|
| Dec -> "bool %s;\n\t%a") h (pp_varlist var_list_delim) (tl, h' :: l)
|
||||||
| (TReal :: tl, RVar h :: h' :: l) ->
|
| (TReal :: tl, RVar h :: h' :: l) ->
|
||||||
Format.fprintf fmt "real %s, %a" h pp_argvarlist (tl, h' :: l)
|
Format.fprintf fmt (
|
||||||
| _ -> raise (MyTypeError "This exception should not have beed be raised.")
|
match var_list_delim with
|
||||||
|
| Base -> "%s, %a"
|
||||||
let rec pp_decvarlist fmt : t_varlist -> unit = function
|
| Arg -> "float %s, %a"
|
||||||
| ([], []) -> ()
|
| Dec -> "float %s;\n\t%a") h (pp_varlist var_list_delim) (tl, h' :: l)
|
||||||
| ([TInt] , IVar h :: []) -> Format.fprintf fmt "int %s;" h
|
|
||||||
| ([TReal], RVar h :: []) -> Format.fprintf fmt "float %s;" h
|
|
||||||
| ([TBool], BVar h :: []) -> Format.fprintf fmt "bool %s;" h
|
|
||||||
| (TInt :: tl, IVar h :: h' :: l) ->
|
|
||||||
Format.fprintf fmt "int %s;\n\t%a" h pp_decvarlist (tl, h' :: l)
|
|
||||||
| (TBool :: tl, BVar h :: h' :: l) ->
|
|
||||||
Format.fprintf fmt "bool %s;\n\t%a" h pp_decvarlist (tl, h' :: l)
|
|
||||||
| (TReal :: tl, RVar h :: h' :: l) ->
|
|
||||||
Format.fprintf fmt "float %s;\n\t%a" h pp_decvarlist (tl, h' :: l)
|
|
||||||
| _ -> raise (MyTypeError "This exception should not have beed be raised.")
|
| _ -> raise (MyTypeError "This exception should not have beed be raised.")
|
||||||
|
|
||||||
let rec pp_retvarlist fmt : t_varlist -> unit = function
|
let rec pp_retvarlist fmt : t_varlist -> unit = function
|
||||||
@ -158,7 +160,7 @@ let rec pp_equations fmt: t_eqlist -> unit = function
|
|||||||
| [] -> ()
|
| [] -> ()
|
||||||
| (patt, expr) :: eqs ->
|
| (patt, expr) :: eqs ->
|
||||||
Format.fprintf fmt "\t%a = %a;\n%a"
|
Format.fprintf fmt "\t%a = %a;\n%a"
|
||||||
pp_varlist patt
|
(pp_varlist Base) patt
|
||||||
pp_expression expr
|
pp_expression expr
|
||||||
pp_equations eqs
|
pp_equations eqs
|
||||||
|
|
||||||
@ -168,11 +170,11 @@ let pp_node fmt node =
|
|||||||
pp_retvarlist (node.n_outputs)
|
pp_retvarlist (node.n_outputs)
|
||||||
node.n_name
|
node.n_name
|
||||||
(* could avoid newlines if they aren't used to seperate statements *)
|
(* could avoid newlines if they aren't used to seperate statements *)
|
||||||
pp_argvarlist node.n_inputs
|
(pp_varlist Arg) node.n_inputs
|
||||||
pp_decvarlist node.n_local_vars
|
(pp_varlist Dec) node.n_local_vars
|
||||||
pp_decvarlist node.n_outputs
|
(pp_varlist Dec) node.n_outputs
|
||||||
pp_equations node.n_equations
|
pp_equations node.n_equations
|
||||||
pp_varlist node.n_outputs
|
(pp_varlist Base) node.n_outputs
|
||||||
|
|
||||||
let rec pp_nodes fmt nodes =
|
let rec pp_nodes fmt nodes =
|
||||||
match nodes with
|
match nodes with
|
||||||
|
Loading…
Reference in New Issue
Block a user