mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2026-04-15 01:13:30 +00:00
Code Issues Projects Releases Wiki Activity

Misc cleanups of MLDS code generation.

Browse Source 
Estimated hours taken: 6
Branches: main

compiler/mercury_compile.m:
compiler/ml_call_gen.m:
compiler/ml_closure_gen.m:
compiler/ml_code_gen.m:
compiler/ml_code_util.m:
compiler/ml_elim_nested.m:
compiler/ml_optimize.m:
compiler/ml_simplify_switch.m:
compiler/ml_string_switch.m:
compiler/ml_switch_gen.m:
compiler/ml_tag_switch.m:
compiler/ml_tailcall.m:
compiler/ml_type_gen.m:
compiler/ml_unify_gen.m:
compiler/ml_util.m:
compiler/mlds.m:
compiler/mlds_to_c.m:
compiler/mlds_to_gcc.m:
compiler/mlds_to_il.m:
compiler/mlds_to_java.m:
compiler/modules.m:
compiler/rtti_to_mlds.m:
compiler/switch_detection.m:
	Misc cleanups of MLDS code generation.
This commit is contained in:
Zoltan Somogyi
2009-01-16 02:31:26 +00:00
parent a06017c81b
commit bc58c406ca
23 changed files with 1001 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/ml_simplify_switch.m
View File

@@ -1,7 +1,7 @@
%-----------------------------------------------------------------------------%
% vim: ft=mercury ts=4 sw=4 et
%-----------------------------------------------------------------------------%
% Copyright (C) 2000-2001, 2003-2008 The University of Melbourne.
% Copyright (C) 2000-2001, 2003-2009 The University of Melbourne.
% This file may only be copied under the terms of the GNU General
% Public License - see the file COPYING in the Mercury distribution.
%-----------------------------------------------------------------------------%
@@ -45,6 +45,7 @@
:- import_module parse_tree.prog_type.
:- import_module bool.
:- import_module cord.
:- import_module int.
:- import_module list.
:- import_module map.
@@ -272,7 +273,7 @@ find_first_and_last_case_3(match_range(MinRval, MaxRval),
:- pred generate_dense_switch(list(mlds_switch_case)::in,
mlds_switch_default::in, int::in, int::in, bool::in,
mlds_type::in, mlds_rval::in, mlds_context::in,
mlds_defns::out, statements::out,
list(mlds_defn)::out, list(statement)::out,
ml_gen_info::in, ml_gen_info::out) is det.
generate_dense_switch(Cases, Default, FirstVal, LastVal, NeedRangeCheck,
@@ -328,18 +329,19 @@ generate_dense_switch(Cases, Default, FirstVal, LastVal, NeedRangeCheck,
MLDS_Context),
DoSwitch = statement(ml_stmt_if_then_else(InRange, SwitchBody, Else),
MLDS_Context),
Statements = [StartComment, DoSwitch] ++
[EndLabelStatement, EndComment]
Statements = [StartComment, DoSwitch, EndLabelStatement, EndComment]
;
NeedRangeCheck = no,
Statements = [StartComment, DoJump | CasesCode] ++
DefaultStatements ++ [EndLabelStatement, EndComment]
Statements =
[StartComment, DoJump | CasesCode] ++
DefaultStatements ++
[EndLabelStatement, EndComment]
),
Decls = CasesDecls.
:- pred generate_cases(list(mlds_switch_case)::in, mlds_label::in,
case_labels_map::in, case_labels_map::out,
mlds_defns::out, statements::out,
list(mlds_defn)::out, list(statement)::out,
ml_gen_info::in, ml_gen_info::out) is det.
generate_cases([], _EndLabel, !CaseLabelsMap, [], [], !Info).
@@ -358,7 +360,7 @@ generate_cases([Case | Cases], EndLabel, !CaseLabelsMap, Decls, Statements,
%
:- pred generate_case(mlds_switch_case::in, mlds_label::in,
case_labels_map::in, case_labels_map::out,
mlds_defns::out, statements::out,
list(mlds_defn)::out, list(statement)::out,
ml_gen_info::in, ml_gen_info::out) is det.
generate_case(Case, EndLabel, CaseLabelsMap0, CaseLabelsMap,