From efc51afc7c8298ecd3b511b8d0faf9ff6d2df22e Mon Sep 17 00:00:00 2001 From: Xavier Leroy Date: Tue, 27 Sep 2022 12:04:31 +0200 Subject: Revised passing of options to `Parse.preprocessed_file` Instead of passing a string that encodes the optional source-to-source transformations to perform, just pass one optional, named argument for each transformation. It is clearer and easier to extend this way. --- cparser/Parse.mli | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'cparser/Parse.mli') diff --git a/cparser/Parse.mli b/cparser/Parse.mli index c406d96c..7b33cc5b 100644 --- a/cparser/Parse.mli +++ b/cparser/Parse.mli @@ -16,8 +16,15 @@ (* Entry point for the library: parse, elaborate, and transform *) -val preprocessed_file: string -> string -> string -> C.program - -(* first arg: desired transformations - second arg: source file name before preprocessing - third arg: file after preprocessing *) +val preprocessed_file: + ?unblock: bool -> + ?struct_passing: bool -> + ?packed_structs: bool -> + string -> string -> C.program + (** [preprocessed_file filename sourcetext] performs parsing, + elaboration, and optional source-to-source transformations. + [filename] is the name of the source file, for error messages. + [sourcetext] is the text of the source file after preprocessing. + The optional arguments indicate which source-to-source + transformations to perform. They default to [false] (don't perform). + *) -- cgit From a1dabb4792446538cce24eb87bcd3ccb3c09f18b Mon Sep 17 00:00:00 2001 From: Xavier Leroy Date: Tue, 27 Sep 2022 12:31:07 +0200 Subject: Handle unstructured 'switch' statements such as Duff's device - New elaboration pass: SwitchNorm - recognizes structured 'switch' statements and puts them in a normalized form; - if selected, transforms unstructured 'switch' statements into a structured switch with goto actions + the original switch body with appropriate labels and gotos. - C2C treatment of 'switch' statements is simplified accordingly. - New language support option `-funstructured-switch`. - Some tests were added (test/regression/switch3.c). --- cparser/Parse.mli | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cparser/Parse.mli') diff --git a/cparser/Parse.mli b/cparser/Parse.mli index 7b33cc5b..a37bd0e0 100644 --- a/cparser/Parse.mli +++ b/cparser/Parse.mli @@ -18,6 +18,7 @@ val preprocessed_file: ?unblock: bool -> + ?switch_norm: [`Off | `Partial | `Full] -> ?struct_passing: bool -> ?packed_structs: bool -> string -> string -> C.program @@ -26,5 +27,5 @@ val preprocessed_file: [filename] is the name of the source file, for error messages. [sourcetext] is the text of the source file after preprocessing. The optional arguments indicate which source-to-source - transformations to perform. They default to [false] (don't perform). - *) + transformations to perform. They default to [false] or [`Off] + (do not perform). *) -- cgit